From 4ca7d7b726062bf1dac659b02c55271f6cfc5014 Mon Sep 17 00:00:00 2001
From: Tengfei Mu <tmu@linkedin.com>
Date: Fri, 23 Aug 2024 12:45:27 -0700
Subject: [PATCH] Move creating live instance after carryover current state

---
 .../java/org/apache/helix/manager/zk/ParticipantManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
index 5099ee6acf..2044dbcd79 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
@@ -156,11 +156,11 @@ public void handleNewSession() throws Exception {
     // This will help to prevent controller from sending any message prematurely.
     // Live instance creation also checks if the expected session is valid or not. Live instance
     // should not be created by an expired zk session.
-    createLiveInstance();
     if (shouldCarryOver()) {
       carryOverPreviousCurrentState(_dataAccessor, _instanceName, _sessionId,
           _manager.getStateMachineEngine(), true);
     }
+    createLiveInstance();
     removePreviousTaskCurrentStates();
 
     /**