Skip to content

Commit 4ac0919

Browse files
authored
Merge pull request #81 from arangodb-helper/bugfix/avoid-callback-in-localslave
Avoid registering for a callback notification when I don't want to be master any
2 parents 1ab5328 + 0411fc0 commit 4ac0919

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

service/runtime_cluster_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ func (s *runtimeClusterManager) Run(ctx context.Context, log *logging.Logger, ru
272272
s.mutex.Unlock()
273273

274274
// Register master changed callback (if needed)
275-
if !callbackRegistered && masterURL != "" {
275+
if !callbackRegistered && masterURL != "" && !s.avoidBeingMaster {
276276
log.Debug("Register master callback...")
277277
if err := s.registerMasterChangedCallback(ctx, ownURL); err != nil {
278278
log.Debugf("Failed to register master callback: %#v", err)

test/Dockerfile-arangodb-golang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1010
pkg-config \
1111
wget \
1212
ca-certificates \
13+
procps \
1314
&& rm -rf /var/lib/apt/lists/*
1415

1516
ENV GOLANG_VERSION 1.8.3

0 commit comments

Comments
 (0)