You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/09/06 08:18:48 UTC
[incubator-inlong] branch INLONG-25 updated: [INLONG-1527]Go SDK
throw error if it fails to connect to master (#1528)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch INLONG-25
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/INLONG-25 by this push:
new 108872a [INLONG-1527]Go SDK throw error if it fails to connect to master (#1528)
108872a is described below
commit 108872aac908530f1d27c693323c7a4069897ae4
Author: Zijie Lu <ws...@gmail.com>
AuthorDate: Mon Sep 6 16:18:44 2021 +0800
[INLONG-1527]Go SDK throw error if it fails to connect to master (#1528)
Signed-off-by: Zijie Lu <ws...@gmail.com>
---
tubemq-client-twins/tubemq-client-go/client/consumer_impl.go | 11 +++++++----
tubemq-client-twins/tubemq-client-go/client/version.go | 2 +-
.../tubemq-client-go/metadata/subscribe_info.go | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/tubemq-client-twins/tubemq-client-go/client/consumer_impl.go b/tubemq-client-twins/tubemq-client-go/client/consumer_impl.go
index a7fb27c..537aa3a 100644
--- a/tubemq-client-twins/tubemq-client-go/client/consumer_impl.go
+++ b/tubemq-client-twins/tubemq-client-go/client/consumer_impl.go
@@ -133,6 +133,9 @@ func (c *consumer) register2Master(needChange bool) error {
}
if !c.master.HasNext {
+ if err != nil {
+ return err
+ }
if rsp != nil {
log.Errorf("[CONSUMER] register2master(%s) failure exist register, client=%s, error: %s", c.master.Address, c.clientID, rsp.GetErrMsg())
}
@@ -487,10 +490,10 @@ func (c *consumer) sendRegisterReq2Broker(partition *metadata.Partition, node *m
func newClient(group string) string {
return group + "_" +
- util.GetLocalHost() + "_" +
- strconv.Itoa(os.Getpid()) + "_" +
- strconv.Itoa(int(time.Now().Unix()*1000)) + "_" +
- strconv.Itoa(int(atomic.AddUint64(&clientID, 1))) + "_" +
+ util.GetLocalHost() + "-" +
+ strconv.Itoa(os.Getpid()) + "-" +
+ strconv.Itoa(int(time.Now().Unix()*1000)) + "-" +
+ strconv.Itoa(int(atomic.AddUint64(&clientID, 1))) + "-" +
tubeMQClientVersion
}
diff --git a/tubemq-client-twins/tubemq-client-go/client/version.go b/tubemq-client-twins/tubemq-client-go/client/version.go
index fad542e..44de222 100644
--- a/tubemq-client-twins/tubemq-client-go/client/version.go
+++ b/tubemq-client-twins/tubemq-client-go/client/version.go
@@ -18,5 +18,5 @@
package client
const (
- tubeMQClientVersion = "0.1.0"
+ tubeMQClientVersion = "go_0.1.0"
)
diff --git a/tubemq-client-twins/tubemq-client-go/metadata/subscribe_info.go b/tubemq-client-twins/tubemq-client-go/metadata/subscribe_info.go
index 6544a4d..06c2a67 100644
--- a/tubemq-client-twins/tubemq-client-go/metadata/subscribe_info.go
+++ b/tubemq-client-twins/tubemq-client-go/metadata/subscribe_info.go
@@ -48,7 +48,7 @@ func (s *SubscribeInfo) GetPartition() *Partition {
// String returns the contents of SubscribeInfo as a string.
func (s *SubscribeInfo) String() string {
- return fmt.Sprintf("%s@%s-%s", s.consumerID, s.group, s.partition.String())
+ return fmt.Sprintf("%s@%s#%s", s.consumerID, s.group, s.partition.String())
}
// NewSubscribeInfo constructs a SubscribeInfo from a given string.