Updated the HazelcastLeadershipService implemenation:

 * Every listener receives all leadership events, even for new topics and
   topics the local instance is not running for a leadership election
 * Now getLeaderBoard() returns all leadership info

Change-Id: Ia11a10ed287d2f8d905dd987beb8052c35be6cf1

@@ -71,7 +71,8 @@ import com.hazelcast.core.MessageListener;
  */
  */
 @Component(immediate = true)
 @Component(immediate = true)
 @Service
 @Service
-public class HazelcastLeadershipService implements LeadershipService {
+public class HazelcastLeadershipService implements LeadershipService,
+                                        MessageListener<byte[]> {
     private static final Logger log =
     private static final Logger log =
         LoggerFactory.getLogger(HazelcastLeadershipService.class);
         LoggerFactory.getLogger(HazelcastLeadershipService.class);
 
 
@@ -87,6 +88,7 @@ public class HazelcastLeadershipService implements LeadershipService {
 
 
     private static final long LEADERSHIP_PERIODIC_INTERVAL_MS = 5 * 1000; // 5s
     private static final long LEADERSHIP_PERIODIC_INTERVAL_MS = 5 * 1000; // 5s
     private static final long LEADERSHIP_REMOTE_TIMEOUT_MS = 15 * 1000;  // 15s
     private static final long LEADERSHIP_REMOTE_TIMEOUT_MS = 15 * 1000;  // 15s
+    private static final String TOPIC_HZ_ID = "LeadershipService/AllTopics";
 
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ClusterService clusterService;
     protected ClusterService clusterService;
@@ -102,18 +104,29 @@ public class HazelcastLeadershipService implements LeadershipService {
     private final Map<String, Topic> topics = Maps.newConcurrentMap();
     private final Map<String, Topic> topics = Maps.newConcurrentMap();
     private NodeId localNodeId;
     private NodeId localNodeId;
 
 
+    private ITopic<byte[]> leaderTopic;
+    private String leaderTopicRegistrationId;
+
     @Activate
     @Activate
     protected void activate() {
     protected void activate() {
         localNodeId = clusterService.getLocalNode().id();
         localNodeId = clusterService.getLocalNode().id();
         listenerRegistry = new AbstractListenerRegistry<>();
         listenerRegistry = new AbstractListenerRegistry<>();
         eventDispatcher.addSink(LeadershipEvent.class, listenerRegistry);
         eventDispatcher.addSink(LeadershipEvent.class, listenerRegistry);
 
 
+        TopicConfig topicConfig = new TopicConfig();
+        topicConfig.setGlobalOrderingEnabled(true);
+        topicConfig.setName(TOPIC_HZ_ID);
+        storeService.getHazelcastInstance().getConfig().addTopicConfig(topicConfig);
+        leaderTopic = storeService.getHazelcastInstance().getTopic(TOPIC_HZ_ID);
+        leaderTopicRegistrationId = leaderTopic.addMessageListener(this);
+
         log.info("Hazelcast Leadership Service started");
         log.info("Hazelcast Leadership Service started");
     }
     }
 
 
     @Deactivate
     @Deactivate
     protected void deactivate() {
     protected void deactivate() {
         eventDispatcher.removeSink(LeadershipEvent.class);
         eventDispatcher.removeSink(LeadershipEvent.class);
+        leaderTopic.removeMessageListener(leaderTopicRegistrationId);
 
 
         for (Topic topic : topics.values()) {
         for (Topic topic : topics.values()) {
             topic.stop();
             topic.stop();
@@ -139,6 +152,9 @@ public class HazelcastLeadershipService implements LeadershipService {
         Topic oldTopic = topics.putIfAbsent(path, topic);
         Topic oldTopic = topics.putIfAbsent(path, topic);
         if (oldTopic == null) {
         if (oldTopic == null) {
             topic.start();
             topic.start();
+            topic.runForLeadership();
+        } else {
+            oldTopic.runForLeadership();
         }
         }
     }
     }
 
 
@@ -156,11 +172,6 @@ public class HazelcastLeadershipService implements LeadershipService {
     public Map<String, Leadership> getLeaderBoard() {
     public Map<String, Leadership> getLeaderBoard() {
         Map<String, Leadership> result = new HashMap<>();
         Map<String, Leadership> result = new HashMap<>();
 
 
-        //
-        // Get the leaders for the topics.
-        // NOTE: A topic is listed only if this instance is running for
-        // a leadership for that topic.
-        //
         for (Topic topic : topics.values()) {
         for (Topic topic : topics.values()) {
             Leadership leadership = new Leadership(topic.topicName(),
             Leadership leadership = new Leadership(topic.topicName(),
                                                    topic.leader(),
                                                    topic.leader(),
@@ -180,12 +191,41 @@ public class HazelcastLeadershipService implements LeadershipService {
         listenerRegistry.removeListener(listener);
         listenerRegistry.removeListener(listener);
     }
     }
 
 
+    @Override
+    public void onMessage(Message<byte[]> message) {
+        LeadershipEvent leadershipEvent =
+            SERIALIZER.decode(message.getMessageObject());
+
+        log.debug("Leadership Event: time = {} type = {} event = {}",
+                  leadershipEvent.time(), leadershipEvent.type(),
+                  leadershipEvent);
+
+        //
+        // If there is no entry for the topic, then create a new one to
+        // keep track of the leadership, but don't run for leadership itself.
+        //
+        String topicName = leadershipEvent.subject().topic();
+        Topic topic = topics.get(topicName);
+        if (topic == null) {
+            topic = new Topic(topicName);
+            Topic oldTopic = topics.putIfAbsent(topicName, topic);
+            if (oldTopic == null) {
+                topic.start();
+            } else {
+                topic = oldTopic;
+            }
+        }
+        topic.receivedLeadershipEvent(leadershipEvent);
+        eventDispatcher.post(leadershipEvent);
+    }
+
     /**
     /**
      * Class for keeping per-topic information.
      * Class for keeping per-topic information.
      */
      */
-    private final class Topic implements MessageListener<byte[]> {
+    private final class Topic {
         private final String topicName;
         private final String topicName;
         private volatile boolean isShutdown = true;
         private volatile boolean isShutdown = true;
+        private volatile boolean isRunningForLeadership = false;
         private volatile long lastLeadershipUpdateMs = 0;
         private volatile long lastLeadershipUpdateMs = 0;
         private ExecutorService leaderElectionExecutor;
         private ExecutorService leaderElectionExecutor;
 
 
@@ -193,8 +233,6 @@ public class HazelcastLeadershipService implements LeadershipService {
         private Lock leaderLock;
         private Lock leaderLock;
         private Future<?> getLockFuture;
         private Future<?> getLockFuture;
         private Future<?> periodicProcessingFuture;
         private Future<?> periodicProcessingFuture;
-        private ITopic<byte[]> leaderTopic;
-        private String leaderTopicRegistrationId;
 
 
         /**
         /**
          * Constructor.
          * Constructor.
@@ -224,38 +262,39 @@ public class HazelcastLeadershipService implements LeadershipService {
         }
         }
 
 
         /**
         /**
-         * Starts leadership election for the topic.
+         * Starts operation.
          */
          */
         private void start() {
         private void start() {
             isShutdown = false;
             isShutdown = false;
-            String lockHzId = "LeadershipService/" + topicName + "/lock";
-            String topicHzId = "LeadershipService/" + topicName + "/topic";
-            leaderLock = storeService.getHazelcastInstance().getLock(lockHzId);
-
             String threadPoolName = "leader-election-" + topicName + "-%d";
             String threadPoolName = "leader-election-" + topicName + "-%d";
             leaderElectionExecutor = Executors.newScheduledThreadPool(2,
             leaderElectionExecutor = Executors.newScheduledThreadPool(2,
                                         namedThreads(threadPoolName));
                                         namedThreads(threadPoolName));
 
 
-            TopicConfig topicConfig = new TopicConfig();
-            topicConfig.setGlobalOrderingEnabled(true);
-            topicConfig.setName(topicHzId);
-            storeService.getHazelcastInstance().getConfig().addTopicConfig(topicConfig);
-
-            leaderTopic =
-                storeService.getHazelcastInstance().getTopic(topicHzId);
-            leaderTopicRegistrationId = leaderTopic.addMessageListener(this);
-
-            getLockFuture = leaderElectionExecutor.submit(new Runnable() {
+            periodicProcessingFuture =
+                leaderElectionExecutor.submit(new Runnable() {
                     @Override
                     @Override
                     public void run() {
                     public void run() {
-                        doLeaderElectionThread();
+                        doPeriodicProcessing();
                     }
                     }
                 });
                 });
-            periodicProcessingFuture =
-                leaderElectionExecutor.submit(new Runnable() {
+        }
+
+        /**
+         * Runs for leadership.
+         */
+        private void runForLeadership() {
+            if (isRunningForLeadership) {
+                return;         // Nothing to do: already running
+            }
+            if (isShutdown) {
+                start();
+            }
+            String lockHzId = "LeadershipService/" + topicName + "/lock";
+            leaderLock = storeService.getHazelcastInstance().getLock(lockHzId);
+            getLockFuture = leaderElectionExecutor.submit(new Runnable() {
                     @Override
                     @Override
                     public void run() {
                     public void run() {
-                        doPeriodicProcessing();
+                        doLeaderElectionThread();
                     }
                     }
                 });
                 });
         }
         }
@@ -265,21 +304,19 @@ public class HazelcastLeadershipService implements LeadershipService {
          */
          */
         private void stop() {
         private void stop() {
             isShutdown = true;
             isShutdown = true;
-            leaderTopic.removeMessageListener(leaderTopicRegistrationId);
+            isRunningForLeadership = false;
             // getLockFuture.cancel(true);
             // getLockFuture.cancel(true);
             // periodicProcessingFuture.cancel(true);
             // periodicProcessingFuture.cancel(true);
             leaderElectionExecutor.shutdownNow();
             leaderElectionExecutor.shutdownNow();
         }
         }
 
 
-        @Override
-        public void onMessage(Message<byte[]> message) {
-            LeadershipEvent leadershipEvent =
-                SERIALIZER.decode(message.getMessageObject());
+        /**
+         * Received a Leadership Event.
+         *
+         * @param leadershipEvent the received Leadership Event
+         */
+        private void receivedLeadershipEvent(LeadershipEvent leadershipEvent) {
             NodeId eventLeaderId = leadershipEvent.subject().leader();
             NodeId eventLeaderId = leadershipEvent.subject().leader();
-
-            log.debug("Leadership Event: time = {} type = {} event = {}",
-                      leadershipEvent.time(), leadershipEvent.type(),
-                      leadershipEvent);
             if (!leadershipEvent.subject().topic().equals(topicName)) {
             if (!leadershipEvent.subject().topic().equals(topicName)) {
                 return;         // Not our topic: ignore
                 return;         // Not our topic: ignore
             }
             }
@@ -296,23 +333,21 @@ public class HazelcastLeadershipService implements LeadershipService {
                     // Another leader: if we are also a leader, then give up
                     // Another leader: if we are also a leader, then give up
                     // leadership and run for re-election.
                     // leadership and run for re-election.
                     //
                     //
-                    if ((leader != null) &&
-                        leader.equals(localNodeId)) {
+                    if ((leader != null) && leader.equals(localNodeId)) {
+                        if (getLockFuture != null) {
                             getLockFuture.cancel(true);
                             getLockFuture.cancel(true);
+                        }
                     } else {
                     } else {
                         // Just update the current leader
                         // Just update the current leader
                         leader = leadershipEvent.subject().leader();
                         leader = leadershipEvent.subject().leader();
                         lastLeadershipUpdateMs = System.currentTimeMillis();
                         lastLeadershipUpdateMs = System.currentTimeMillis();
                     }
                     }
-                    eventDispatcher.post(leadershipEvent);
                     break;
                     break;
                 case LEADER_BOOTED:
                 case LEADER_BOOTED:
                     // Remove the state for the current leader
                     // Remove the state for the current leader
-                    if ((leader != null) &&
-                        eventLeaderId.equals(leader)) {
+                    if ((leader != null) && eventLeaderId.equals(leader)) {
                         leader = null;
                         leader = null;
                     }
                     }
-                    eventDispatcher.post(leadershipEvent);
                     break;
                     break;
                 default:
                 default:
                     break;
                     break;
@@ -340,7 +375,7 @@ public class HazelcastLeadershipService implements LeadershipService {
                             leadershipEvent = new LeadershipEvent(
                             leadershipEvent = new LeadershipEvent(
                                 LeadershipEvent.Type.LEADER_REELECTED,
                                 LeadershipEvent.Type.LEADER_REELECTED,
                                 new Leadership(topicName, localNodeId, 0));
                                 new Leadership(topicName, localNodeId, 0));
-                            // Dispatch to all remote instances
+                            // Dispatch to all instances
                             leaderTopic.publish(SERIALIZER.encode(leadershipEvent));
                             leaderTopic.publish(SERIALIZER.encode(leadershipEvent));
                         } else {
                         } else {
                             //
                             //
@@ -404,7 +439,6 @@ public class HazelcastLeadershipService implements LeadershipService {
                     leadershipEvent = new LeadershipEvent(
                     leadershipEvent = new LeadershipEvent(
                         LeadershipEvent.Type.LEADER_ELECTED,
                         LeadershipEvent.Type.LEADER_ELECTED,
                         new Leadership(topicName, localNodeId, 0));
                         new Leadership(topicName, localNodeId, 0));
-                    eventDispatcher.post(leadershipEvent);
                     leaderTopic.publish(SERIALIZER.encode(leadershipEvent));
                     leaderTopic.publish(SERIALIZER.encode(leadershipEvent));
                 }
                 }
 
 
@@ -430,7 +464,6 @@ public class HazelcastLeadershipService implements LeadershipService {
                     leadershipEvent = new LeadershipEvent(
                     leadershipEvent = new LeadershipEvent(
                                 LeadershipEvent.Type.LEADER_BOOTED,
                                 LeadershipEvent.Type.LEADER_BOOTED,
                                 new Leadership(topicName, localNodeId, 0));
                                 new Leadership(topicName, localNodeId, 0));
-                    eventDispatcher.post(leadershipEvent);
                     leaderTopic.publish(SERIALIZER.encode(leadershipEvent));
                     leaderTopic.publish(SERIALIZER.encode(leadershipEvent));
                     leaderLock.unlock();
                     leaderLock.unlock();
                 }
                 }