Client-side generated instanceId when registering a service

nacos-group · Jun 6, 2021 · 4ff85e4 · 4ff85e4
1 parent b94a7bb
commit 4ff85e4
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 1 deletion.
diff --git a/include/constant/PropertyKeyConst.h b/include/constant/PropertyKeyConst.h
@@ -58,6 +58,10 @@ class PropertyKeyConst {
 
     static const int NACOS_DEFAULT_PORT = 8848;
 
+    static const NacosString INSTANCE_ID_SEQ_FILE;
+
+    static const NacosString INSTANCE_ID_PREFIX;
+
     /*public static class SystemEnv {
 
         static const NacosString ALIBABA_ALIWARE_ENDPOINT_PORT = "ALIBABA_ALIWARE_ENDPOINT_PORT";

diff --git a/src/config/AppConfigManager.cpp b/src/config/AppConfigManager.cpp
@@ -102,6 +102,7 @@ void AppConfigManager::initDefaults() {
 
     NacosString homedir = DirUtils::getHome();
 
+    set(PropertyKeyConst::INSTANCE_ID_SEQ_FILE, homedir + ConfigConstant::FILE_SEPARATOR + "nacos" + ConfigConstant::FILE_SEPARATOR + "instance_seq.dat");
     set(PropertyKeyConst::NACOS_SNAPSHOT_PATH, homedir + ConfigConstant::FILE_SEPARATOR + "nacos" + ConfigConstant::FILE_SEPARATOR + "snapshot");
     log_info("[AppConfigManager]-initDefaults:DEFAULT_SNAPSHOT_PATH:%s\n", appConfig[PropertyKeyConst::NACOS_SNAPSHOT_PATH].c_str());
 }

diff --git a/src/constant/PropertyKeyConst.cpp b/src/constant/PropertyKeyConst.cpp
@@ -50,4 +50,6 @@ const NacosString PropertyKeyConst::CLIENT_NAME = "nacos.client.name";
 const NacosString PropertyKeyConst::AUTH_USERNAME = "nacos.auth.username";
 const NacosString PropertyKeyConst::AUTH_PASSWORD = "nacos.auth.password";
 const NacosString PropertyKeyConst::LOCAL_IP = "nacos.client.ip";
+const NacosString PropertyKeyConst::INSTANCE_ID_SEQ_FILE = "nacos.instId.seq.file";
+const NacosString PropertyKeyConst::INSTANCE_ID_PREFIX = "nacos.instId.prefix";
 }//namespace nacos
diff --git a/src/factory/NacosServiceFactory.cpp b/src/factory/NacosServiceFactory.cpp
@@ -19,6 +19,7 @@
 #include "src/naming/subscribe/HostReactor.h"
 #include "src/security/SecurityManager.h"
 #include "src/utils/ConfigParserUtils.h"
+#include "src/utils/SequenceProvider.h"
 #include "utils/DirUtils.h"
 
 //Unlike Java, in cpp, there's no container, no spring to do the ORM job, so I have to handle it myself
@@ -114,6 +115,10 @@ NamingService *NacosServiceFactory::CreateNamingService() NACOS_THROW(NacosExcep
     HostReactor *hostReactor = new HostReactor(objectConfigData);
     objectConfigData->_hostReactor = hostReactor;
 
+    const NacosString &seqConfile = appConfigManager->get(PropertyKeyConst::INSTANCE_ID_SEQ_FILE);
+    SequenceProvider<int64_t> *sequenceProvider = new SequenceProvider<int64_t>(seqConfile, 1, 10);
+    objectConfigData->_sequenceProvider = sequenceProvider;
+
     objectConfigData->checkAssembledObject();
     NamingService *instance = new NacosNamingService(objectConfigData);
 

diff --git a/src/factory/ObjectConfigData.cpp b/src/factory/ObjectConfigData.cpp
@@ -9,6 +9,7 @@
 #include "src/listen/ClientWorker.h"
 #include "src/security/SecurityManager.h"
 #include "utils/UuidUtils.h"
+#include "src/utils/SequenceProvider.h"
 
 namespace nacos{
 
@@ -44,6 +45,7 @@ void ObjectConfigData::checkNamingService() NACOS_THROW(NacosException) {
     NACOS_ASSERT(_serverListManager != NULL);
     NACOS_ASSERT(_udpNamingServiceListener != NULL);
     NACOS_ASSERT(_udpNamingServiceListener != NULL);
+    NACOS_ASSERT(_sequenceProvider != NULL);
 }
 
 void ObjectConfigData::checkConfigService() NACOS_THROW(NacosException) {
@@ -206,6 +208,12 @@ void ObjectConfigData::destroyNamingService() {
         delete _appConfigManager;
         _appConfigManager = NULL;
     }
+
+    if (_sequenceProvider != NULL)
+    {
+        delete _sequenceProvider;
+        _sequenceProvider = NULL;
+    }
 }
 
 void ObjectConfigData::destroyMaintainService() {

diff --git a/src/factory/ObjectConfigData.h b/src/factory/ObjectConfigData.h
@@ -20,6 +20,7 @@ class LocalSnapshotManager;
 class SecurityManager;
 class UdpNamingServiceListener;
 class HostReactor;
+template <typename T>class SequenceProvider;
 
 enum FactoryType {
     CONFIG = 0,
@@ -58,6 +59,7 @@ class ObjectConfigData {
     SecurityManager *_securityManager;
     UdpNamingServiceListener *_udpNamingServiceListener;
     HostReactor *_hostReactor;
+    SequenceProvider<int64_t> *_sequenceProvider;
 };
 }//namespace nacos
 

diff --git a/src/naming/NacosNamingService.cpp b/src/naming/NacosNamingService.cpp
@@ -2,6 +2,7 @@
 #include "src/naming/subscribe/SubscriptionPoller.h"
 #include "src/naming/subscribe/UdpNamingServiceListener.h"
 #include "src/naming/beat/BeatReactor.h"
+#include "src/utils/SequenceProvider.h"
 #include "utils/NamingUtils.h"
 #include "constant/UtilAndComs.h"
 #include "utils/ParamUtils.h"
@@ -88,7 +89,8 @@ void NacosNamingService::registerInstance
                 const NacosString &groupName,
                 Instance &instance
         ) NACOS_THROW(NacosException) {
-
+    const NacosString &instanceIdPrefix = _objectConfigData->_appConfigManager->get(PropertyKeyConst::INSTANCE_ID_PREFIX);
+    instance.instanceId = instanceIdPrefix + NacosStringOps::valueOf(_objectConfigData->_sequenceProvider->next());
     if (instance.ephemeral) {
         BeatInfo beatInfo;
         beatInfo.serviceName = NamingUtils::getGroupedName(serviceName, groupName);