rebase and incorporate pr feedback

Signed-off-by: Nicholas Walter Knize <[email protected]>
opensearch-project · Mar 4, 2022 · 32e950f · 32e950f
1 parent 60e8a58
commit 32e950f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/index/engine/InternalEngine.java b/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
@@ -250,7 +250,7 @@ public InternalEngine(EngineConfig engineConfig) {
  mergeScheduler = scheduler = new EngineMergeScheduler(engineConfig.getShardId(), engineConfig.getIndexSettings());
  throttle = new IndexThrottle();
  try {
- store.trimUnsafeCommits(config().getTranslogConfig().getTranslogPath());
+ store.trimUnsafeCommits(engineConfig.getTranslogConfig().getTranslogPath());
  translog = openTranslog(engineConfig, translogDeletionPolicy, engineConfig.getGlobalCheckpointSupplier(), seqNo -> {
  final LocalCheckpointTracker tracker = getLocalCheckpointTracker();
  assert tracker != null || getTranslog().isOpen() == false;

diff --git a/server/src/main/java/org/opensearch/index/shard/IndexShard.java b/server/src/main/java/org/opensearch/index/shard/IndexShard.java
@@ -1690,14 +1690,14 @@ public long recoverLocallyUpToGlobalCheckpoint() {
  logger.debug("skip local recovery as failed to find the safe commit", e);
  return UNASSIGNED_SEQ_NO;
  }
- if (safeCommit.isPresent() == false) {
- logger.trace("skip local recovery as no safe commit found");
- return UNASSIGNED_SEQ_NO;
- }
- assert safeCommit.get().localCheckpoint <= globalCheckpoint : safeCommit.get().localCheckpoint + " > " + globalCheckpoint;
  try {
  maybeCheckIndex(); // check index here and won't do it again if ops-based recovery occurs
  recoveryState.setStage(RecoveryState.Stage.TRANSLOG);
+ if (safeCommit.isPresent() == false) {
+ logger.trace("skip local recovery as no safe commit found");
+ return UNASSIGNED_SEQ_NO;
+ }
+ assert safeCommit.get().localCheckpoint <= globalCheckpoint : safeCommit.get().localCheckpoint + " > " + globalCheckpoint;
  if (safeCommit.get().localCheckpoint == globalCheckpoint) {
  logger.trace(
  "skip local recovery as the safe commit is up to date; safe commit {} global checkpoint {}",