issue=#982 bugfix.nexus-session-id

baidu · Aug 29, 2016 · ed4371a · ed4371a
1 parent 0a7e8ed
commit ed4371a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/tabletnode/tabletnode_zk_adapter.cc b/src/tabletnode/tabletnode_zk_adapter.cc
@@ -363,14 +363,15 @@ void InsTabletNodeZkAdapter::Init() {
     // create session
     m_ins_sdk = new galaxy::ins::sdk::InsSDK(FLAGS_tera_ins_addr_list);
 
+    // create node
+    std::string lock_key = root_path + kTsListPath + "/" + m_server_addr;
+    CHECK(m_ins_sdk->Lock(lock_key, &err)) << "register fail";
+
     // get session id
+    // session-id may be changed during Lock(), so we must be call Lock() first, and then get the session-id.
     std::string session_id = m_ins_sdk->GetSessionID();
     m_tabletnode_impl->SetSessionId(session_id);
     m_tabletnode_impl->SetTabletNodeStatus(TabletNodeImpl::kIsRunning);
-
-    // create node
-    std::string lock_key = root_path + kTsListPath + "/" + m_server_addr;
-    CHECK(m_ins_sdk->Lock(lock_key, &err)) << "register fail";
     LOG(INFO) << "create ts-node success: " << session_id;
 
     // create watch node