Remove additional calls to KVS init in TLogServer in favor of a single call at startup.
This commit is contained in:
parent
1030f6c536
commit
c1b2519b9c
|
@ -1676,7 +1676,6 @@ ACTOR Future<Void> initPersistentState(TLogData* self, Reference<LogData> logDat
|
|||
|
||||
// PERSIST: Initial setup of persistentData for a brand new tLog for a new database
|
||||
state IKeyValueStore* storage = self->persistentData;
|
||||
wait(ioTimeoutError(storage->init(), SERVER_KNOBS->TLOG_MAX_CREATE_DURATION));
|
||||
storage->set(persistFormat);
|
||||
storage->set(
|
||||
KeyValueRef(BinaryWriter::toValue(logData->logId, Unversioned()).withPrefix(persistCurrentVersionKeys.begin),
|
||||
|
@ -2295,7 +2294,6 @@ ACTOR Future<Void> restorePersistentState(TLogData* self,
|
|||
TraceEvent("TLogRestorePersistentState", self->dbgid).log();
|
||||
|
||||
state IKeyValueStore* storage = self->persistentData;
|
||||
wait(storage->init());
|
||||
state Future<Optional<Value>> fFormat = storage->readValue(persistFormat.key);
|
||||
state Future<RangeResult> fVers = storage->readRange(persistCurrentVersionKeys);
|
||||
state Future<RangeResult> fKnownCommitted = storage->readRange(persistKnownCommittedVersionKeys);
|
||||
|
|
|
@ -2117,7 +2117,6 @@ ACTOR Future<Void> initPersistentState(TLogData* self, Reference<LogData> logDat
|
|||
|
||||
// PERSIST: Initial setup of persistentData for a brand new tLog for a new database
|
||||
state IKeyValueStore* storage = self->persistentData;
|
||||
wait(storage->init());
|
||||
storage->set(persistFormat);
|
||||
storage->set(
|
||||
KeyValueRef(BinaryWriter::toValue(logData->logId, Unversioned()).withPrefix(persistCurrentVersionKeys.begin),
|
||||
|
@ -2759,7 +2758,6 @@ ACTOR Future<Void> restorePersistentState(TLogData* self,
|
|||
TraceEvent("TLogRestorePersistentState", self->dbgid).log();
|
||||
|
||||
state IKeyValueStore* storage = self->persistentData;
|
||||
wait(storage->init());
|
||||
state Future<Optional<Value>> fFormat = storage->readValue(persistFormat.key);
|
||||
state Future<Optional<Value>> fRecoveryLocation = storage->readValue(persistRecoveryLocationKey);
|
||||
state Future<RangeResult> fVers = storage->readRange(persistCurrentVersionKeys);
|
||||
|
|
|
@ -2996,7 +2996,6 @@ ACTOR Future<Void> initPersistentStorage(TLogData* self) {
|
|||
|
||||
// PERSIST: Initial setup of persistentData for a brand new tLog for a new database
|
||||
state IKeyValueStore* storage = self->persistentData;
|
||||
wait(storage->init());
|
||||
storage->set(persistFormat);
|
||||
|
||||
wait(storage->commit());
|
||||
|
@ -3019,7 +3018,6 @@ ACTOR Future<Void> restorePersistentState(TLogData* self,
|
|||
TraceEvent("TLogRestorePersistentState", self->dbgid).log();
|
||||
|
||||
state IKeyValueStore* storage = self->persistentData;
|
||||
wait(storage->init());
|
||||
state Future<Optional<Value>> fFormat = storage->readValue(persistFormat.key);
|
||||
state Future<Optional<Value>> fRecoveryLocation = storage->readValue(persistRecoveryLocationKey);
|
||||
state Future<Optional<Value>> fClusterId = storage->readValue(persistClusterIdKey);
|
||||
|
|
Loading…
Reference in New Issue