注册实例时支持指定实例id (#39)

* 注册实例时支持指定实例id

* quickstart/provider examples 添加注释，标明实例id不是必填

---------

Co-authored-by: rockyang <[email protected]>

Author: movebean

examples/quickstart/provider.cpp

@@ -202,13 +202,18 @@ int ProviderServer::Register() {
   register_req.SetHealthCheckFlag(true);
   register_req.SetHealthCheckType(polaris::kHeartbeatHealthCheck);
   register_req.SetTtl(kHeartbeatTtl);
+  // 实例id不是必填，如果不填，服务端会默认生成一个唯一Id，否则当提供实例id时，需要保证实例id是唯一的
+  std::string provided_instance_id = "instance-provided-id";
+  register_req.SetInstanceId(provided_instance_id);
 
   // 注册实例
   auto ret_code = provider_->Register(register_req, instance_id_);
   if (ret_code != polaris::kReturnOk && ret_code != polaris::kReturnExistedResource) {
     std::cout << "register instance with error:" << polaris::ReturnCodeToMsg(ret_code).c_str() << std::endl;
     return ret_code;
   }
+  std::cout << "register instance with instance id:" << instance_id_ << std::endl;
+  sleep(1);
 
   // 启动心跳上报线程
   heartbeat_thread_ = std::unique_ptr<std::thread>(new std::thread([=] {

include/polaris/provider.h

@@ -106,6 +106,11 @@ class InstanceRegisterRequest : Noncopyable {
   /// @param campus 节点所在园区
   void SetLocation(const std::string& region, const std::string& zone, const std::string& campus);
 
+  /// @brief 设置实例id，可选，默认会在服务端生产实例id
+  ///
+  /// @param instance_id 提供的实例id
+  void SetInstanceId(const std::string& instance_id);
+
   class Impl;
   Impl& GetImpl() const;
 

polaris/provider/request.cpp

@@ -63,6 +63,10 @@ void InstanceRegisterRequest::SetLocation(const std::string& region, const std::
   impl_->campus_ = campus;
 }
 
+void InstanceRegisterRequest::SetInstanceId(const std::string& instance_id) {
+  impl_->instance_id_ = instance_id;
+}
+
 // 反注册请求
 InstanceDeregisterRequest::InstanceDeregisterRequest(const std::string& service_token, const std::string& instance_id) {
   impl_ = new Impl();
@@ -149,6 +153,9 @@ v1::Instance* InstanceRegisterRequest::Impl::ToPb() const {
   // 设置实例信息  注册不设置 id 和 health status
   instance->mutable_host()->set_value(host_);
   instance->mutable_port()->set_value(static_cast<uint32_t>(port_));
+  if (!instance_id_.empty()) {
+    instance->mutable_id()->set_value(instance_id_);
+  }
   if (!vpc_id_.empty()) {
     instance->mutable_vpc_id()->set_value(vpc_id_);
   }

polaris/provider/request.h

@@ -86,6 +86,7 @@ class InstanceRegisterRequest::Impl : public ProviderRequestBase {
   bool health_check_flag_;                       ///< 是否开启健康检查，默认不开启
   optional<HealthCheckType> health_check_type_;  ///< 健康检查类型
   optional<int> ttl_;                            ///< ttl超时时间，单位：秒
+  std::string instance_id_;                      ///< 实例本身提供的实例id，可选
 
   // 位置信息
   std::string region_;