Clear heartbeats after rebuild (whting the same transaction)

Author: jjezra

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/logging/LogMessageKeys.java

@@ -58,6 +58,7 @@ public enum LogMessageKeys {
     TRANSACTION_ID,
     TRANSACTION_NAME,
     AGE_SECONDS,
+    AGE_MILLISECONDS,
     CONSTITUENT,
     TOTAL_MICROS,
     // record splitting/unsplitting
@@ -162,6 +163,7 @@ public enum LogMessageKeys {
     RECORDS_PER_SECOND,
     DOCUMENT,
     SESSION_ID,
+    EXISTING_SESSION_ID,
     INDEXER_SESSION_ID,
     INDEXER_ID,
     INDEX_STATE_PRECONDITION,

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/provider/foundationdb/IndexingBase.java

@@ -1027,7 +1027,11 @@ public CompletableFuture<Void> rebuildIndexAsync(@Nonnull FDBRecordStore store)
             return rangeSet.insertRangeAsync(null, null);
         }))
                 .thenCompose(vignore -> setIndexingTypeOrThrow(store, false))
-                .thenCompose(vignore -> rebuildIndexInternalAsync(store));
+                .thenCompose(vignore -> rebuildIndexInternalAsync(store))
+                .thenCompose(vignore -> forEachTargetIndex(index -> {
+                    clearHeartbeatSingleTarget(store, index);
+                    return null;
+                }));
     }
 
     abstract CompletableFuture<Void> rebuildIndexInternalAsync(FDBRecordStore store);

fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/provider/foundationdb/IndexingHeartbeat.java

@@ -96,7 +96,11 @@ private void validateNonCompetingHeartbeat(KeyValue kv) {
                 final IndexBuildProto.IndexingHeartbeat otherHeartbeat = IndexBuildProto.IndexingHeartbeat.parseFrom(kv.getValue());
                 final long age = now - otherHeartbeat.getHeartbeatTimeMilliseconds();
                 if (age > 0 && age < leaseLength) {
-                    throw new SynchronizedSessionLockedException("Failed to initialize the session because of an existing session in progress");
+                    throw new SynchronizedSessionLockedException("Failed to initialize the session because of an existing session in progress")
+                            .addLogInfo(LogMessageKeys.SESSION_ID, sessionId)
+                            .addLogInfo(LogMessageKeys.EXISTING_SESSION_ID, otherSessionId)
+                            .addLogInfo(LogMessageKeys.AGE_MILLISECONDS, age)
+                            .addLogInfo(LogMessageKeys.TIME_LIMIT_MILLIS, leaseLength);
                     // TODO: log details
                 }
             } catch (InvalidProtocolBufferException e) {