From 7d6a1c130acbea7b6c585705bc5b1222fe5bb335 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 5 Jul 2017 16:00:03 +0800 Subject: [PATCH 1/3] Add heartbeat service in InstanceDiscoveryService --- apm-network/src/main/proto/DiscoveryService.proto | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apm-network/src/main/proto/DiscoveryService.proto b/apm-network/src/main/proto/DiscoveryService.proto index 4071b3f4b..4534d04c7 100644 --- a/apm-network/src/main/proto/DiscoveryService.proto +++ b/apm-network/src/main/proto/DiscoveryService.proto @@ -11,18 +11,26 @@ service InstanceDiscoveryService { rpc register (ApplicationInstance) returns (ApplicationInstanceMapping) { } + rpc heartbeat (ApplicationInstanceHeartbeat) returns (Downstream) { + } + rpc registerRecover (ApplicationInstanceMapping) returns (Downstream) { } } message ApplicationInstance { int32 applicationId = 1; + int64 registerTime = 2; } message ApplicationInstanceMapping { int32 applicationId = 1; int32 applicationInstanceId = 2; - int64 registerTime = 3; +} + +message ApplicationInstanceHeartbeat { + int32 applicationInstanceId = 1; + int64 heartbeatTime = 2; } //discovery service for ServiceName by Network address or application code From f93c5f973e620ba93457ee97855e1dba6202a7d2 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 5 Jul 2017 16:14:01 +0800 Subject: [PATCH 2/3] add registerTime in ApplicationInstanceMapping because of the register recover service need the origin register time --- apm-network/src/main/proto/DiscoveryService.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/apm-network/src/main/proto/DiscoveryService.proto b/apm-network/src/main/proto/DiscoveryService.proto index 4534d04c7..e7e919b7a 100644 --- a/apm-network/src/main/proto/DiscoveryService.proto +++ b/apm-network/src/main/proto/DiscoveryService.proto @@ -26,6 +26,7 @@ message ApplicationInstance { message ApplicationInstanceMapping { int32 applicationId = 1; int32 applicationInstanceId = 2; + int64 registerTime = 3; } message ApplicationInstanceHeartbeat { From a29a1c02c52b946090a3394bc1b419d92261c1f5 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Wed, 5 Jul 2017 16:29:24 +0800 Subject: [PATCH 3/3] Add ApplicationInstanceRecover message for the request of instance recover service --- apm-network/src/main/proto/DiscoveryService.proto | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apm-network/src/main/proto/DiscoveryService.proto b/apm-network/src/main/proto/DiscoveryService.proto index e7e919b7a..c1a14bcfb 100644 --- a/apm-network/src/main/proto/DiscoveryService.proto +++ b/apm-network/src/main/proto/DiscoveryService.proto @@ -14,7 +14,7 @@ service InstanceDiscoveryService { rpc heartbeat (ApplicationInstanceHeartbeat) returns (Downstream) { } - rpc registerRecover (ApplicationInstanceMapping) returns (Downstream) { + rpc registerRecover (ApplicationInstanceRecover) returns (Downstream) { } } @@ -26,6 +26,11 @@ message ApplicationInstance { message ApplicationInstanceMapping { int32 applicationId = 1; int32 applicationInstanceId = 2; +} + +message ApplicationInstanceRecover { + int32 applicationId = 1; + int32 applicationInstanceId = 2; int64 registerTime = 3; } @@ -56,5 +61,4 @@ message ServiceNameMappingElement { message ServiceNameElement { string serviceName = 1; int32 applicationId = 2; -} - +} \ No newline at end of file