SLING-5216 : another VotingHandler test case added - changed analyzeVotings return value for this - but no other changes to the analyzeVotings algo or code
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1712016 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java b/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java
index 38c90b6..3d3b822 100644
--- a/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java
+++ b/src/main/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandler.java
@@ -21,8 +21,10 @@
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
import org.apache.felix.scr.annotations.Activate;
@@ -67,7 +69,16 @@
// @Property(name = EventConstants.EVENT_FILTER, value = "(path="
// + org.apache.sling.discovery.viewmgr.Constants.ROOT_PATH + ")") })
public class VotingHandler implements EventHandler {
-
+
+ public static enum VotingDetail {
+ PROMOTED,
+ WINNING,
+ VOTED_YES,
+ VOTED_NO,
+ UNCHANGED,
+ TIMEDOUT
+ }
+
private final static Comparator<VotingView> VOTING_COMPARATOR = new Comparator<VotingView>() {
public int compare(VotingView o1, VotingView o2) {
@@ -184,7 +195,12 @@
* SLING-2885: this method must be synchronized as it can be called concurrently
* by the HearbeatHandler.doCheckView and the VotingHandler.handleEvent.
*/
- public synchronized void analyzeVotings(final ResourceResolver resourceResolver) throws PersistenceException {
+ public synchronized Map<VotingView,VotingDetail> analyzeVotings(final ResourceResolver resourceResolver) throws PersistenceException {
+ if (!activated) {
+ logger.info("analyzeVotings: VotingHandler not yet initialized, can't vote.");
+ return null;
+ }
+ Map<VotingView,VotingDetail> result = new HashMap<VotingView,VotingDetail>();
// SLING-3406: refreshing resourceResolver/session here to get the latest state from the repository
logger.debug("analyzeVotings: start. slingId: {}", slingId);
resourceResolver.refresh();
@@ -197,17 +213,23 @@
promote(resourceResolver, winningVote.getResource());
// SLING-3406: committing resourceResolver/session here, while we're in the synchronized
resourceResolver.commit();
+
+ // for test verification
+ result.put(winningVote, VotingDetail.PROMOTED);
+ return result;
} else {
logger.info("analyzeVotings: there is a winning vote. No need to vote any further. Expecting it to get promoted to established: "
+ winningVote);
- return;
+
+ result.put(winningVote, VotingDetail.WINNING);
+ return result;
}
}
List<VotingView> ongoingVotings = VotingHelper.listVotings(resourceResolver, config);
if (ongoingVotings == null || ongoingVotings.size() == 0) {
logger.debug("analyzeVotings: no ongoing votings at the moment. done.");
- return;
+ return result;
}
Collections.sort(ongoingVotings, VOTING_COMPARATOR);
VotingView yesVote = null;
@@ -219,13 +241,18 @@
// if a voting has timed out, delete it
logger.info("analyzeVotings: deleting a timed out voting: "+voting);
voting.remove(false);
+ result.put(voting, VotingDetail.TIMEDOUT);
continue;
}
if (voting.hasNoVotes()) {
if (!votedNo) {
logger.info("analyzeVotings: vote already has no votes, so I shall also vote no: "+voting);
voting.vote(slingId, false, null);
- } // else ignore silently
+ result.put(voting, VotingDetail.VOTED_NO);
+ } else {
+ // else ignore silently
+ result.put(voting, VotingDetail.UNCHANGED);
+ }
continue;
}
String liveComparison = voting.matchesLiveView(config);
@@ -234,6 +261,9 @@
logger.info("analyzeVotings: vote doesnt match my live view, voting no. "
+ "comparison result: "+liveComparison+", vote: "+voting);
voting.vote(slingId, false, null);
+ result.put(voting, VotingDetail.VOTED_NO);
+ } else {
+ result.put(voting, VotingDetail.UNCHANGED);
}
continue;
}
@@ -247,7 +277,11 @@
if (!votedNo) {
logger.info("analyzeVotings: already voted yes, so voting no for: "+voting);
voting.vote(slingId, false, null);
- } // else ignore silently
+ result.put(voting, VotingDetail.VOTED_NO);
+ } else {
+ // else ignore silently
+ result.put(voting, VotingDetail.UNCHANGED);
+ }
continue;
}
if (!votedYes) {
@@ -262,10 +296,15 @@
if (!votedYes) {
logger.info("analyzeVotings: declaring my personal winner: "+yesVote);
yesVote.vote(slingId, true, leaderElectionId);
- } // else don't double vote / log
+ result.put(yesVote, VotingDetail.VOTED_YES);
+ } else {
+ // else don't double vote / log
+ result.put(yesVote, VotingDetail.UNCHANGED);
+ }
}
resourceResolver.commit();
logger.debug("analyzeVotings: result: my yes vote was for: " + yesVote);
+ return result;
}
public void cleanupTimedoutVotings(final ResourceResolver resourceResolver) {
diff --git a/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java b/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
index 44efedd..8ea2a73 100644
--- a/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
+++ b/src/main/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHandler.java
@@ -350,7 +350,7 @@
}
/** Issue a cluster local heartbeat (into the repository) **/
- private void issueClusterLocalHeartbeat() {
+ protected void issueClusterLocalHeartbeat() {
if (logger.isDebugEnabled()) {
logger.debug("issueClusterLocalHeartbeat: storing cluster-local heartbeat to repository for "+slingId);
}
diff --git a/src/test/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandlerTest.java b/src/test/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandlerTest.java
new file mode 100644
index 0000000..9271a8d
--- /dev/null
+++ b/src/test/java/org/apache/sling/discovery/impl/cluster/voting/VotingHandlerTest.java
@@ -0,0 +1,473 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.discovery.impl.cluster.voting;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Session;
+
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.commons.testing.jcr.RepositoryProvider;
+import org.apache.sling.commons.threads.ModifiableThreadPoolConfig;
+import org.apache.sling.commons.threads.impl.DefaultThreadPool;
+import org.apache.sling.discovery.base.its.setup.OSGiMock;
+import org.apache.sling.discovery.base.its.setup.VirtualInstanceHelper;
+import org.apache.sling.discovery.base.its.setup.mock.DummyResourceResolverFactory;
+import org.apache.sling.discovery.commons.providers.spi.base.DummySlingSettingsService;
+import org.apache.sling.discovery.impl.cluster.voting.VotingHandler.VotingDetail;
+import org.apache.sling.discovery.impl.common.heartbeat.HeartbeatHandler;
+import org.apache.sling.discovery.impl.common.heartbeat.HeartbeatHelper;
+import org.apache.sling.discovery.impl.setup.TestConfig;
+import org.eclipse.jetty.util.ConcurrentHashSet;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import junitx.util.PrivateAccessor;
+
+public class VotingHandlerTest {
+
+
+ protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ VotingHandler votingHandler1;
+ VotingHandler votingHandler2;
+ VotingHandler votingHandler3;
+ VotingHandler votingHandler4;
+ VotingHandler votingHandler5;
+
+ String slingId1;
+ String slingId2;
+ String slingId3;
+ String slingId4;
+ String slingId5;
+
+ ResourceResolverFactory factory;
+ ResourceResolver resourceResolver;
+ TestConfig config;
+
+ DefaultThreadPool threadPool;
+
+ private void resetRepo() throws Exception {
+ Session l = RepositoryProvider.instance().getRepository()
+ .loginAdministrative(null);
+ try{
+ l.getNode("/var");
+ l.removeItem("/var");
+ } catch(PathNotFoundException pnfe) {
+ // well then we probably dont have to do any cleanup
+ }
+ l.save();
+ l.logout();
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ slingId1 = UUID.randomUUID().toString();
+ slingId2 = UUID.randomUUID().toString();
+ slingId3 = UUID.randomUUID().toString();
+ slingId4 = UUID.randomUUID().toString();
+ slingId5 = UUID.randomUUID().toString();
+
+ factory = new DummyResourceResolverFactory();
+ resetRepo();
+ config = new TestConfig("/var/discovery/impltesting/");
+ config.setHeartbeatInterval(999);
+ config.setHeartbeatTimeout(60);
+
+ votingHandler1 = VotingHandler.testConstructor(new DummySlingSettingsService(slingId1), factory, config);
+ votingHandler2 = VotingHandler.testConstructor(new DummySlingSettingsService(slingId2), factory, config);
+ votingHandler3 = VotingHandler.testConstructor(new DummySlingSettingsService(slingId3), factory, config);
+ votingHandler4 = VotingHandler.testConstructor(new DummySlingSettingsService(slingId4), factory, config);
+ votingHandler5 = VotingHandler.testConstructor(new DummySlingSettingsService(slingId5), factory, config);
+
+ resourceResolver = factory.getAdministrativeResourceResolver(null);
+
+ ModifiableThreadPoolConfig tpConfig = new ModifiableThreadPoolConfig();
+ tpConfig.setMinPoolSize(80);
+ tpConfig.setMaxPoolSize(80);
+ threadPool = new DefaultThreadPool("testing", tpConfig);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ resourceResolver.close();
+
+ threadPool.shutdown();
+ }
+
+ @Test
+ public void testActivateDeactivate() throws Exception {
+ assertFalse((Boolean)PrivateAccessor.getField(votingHandler1, "activated"));
+ votingHandler1.activate(null);
+ assertTrue((Boolean)PrivateAccessor.getField(votingHandler1, "activated"));
+ votingHandler1.deactivate();
+ assertFalse((Boolean)PrivateAccessor.getField(votingHandler1, "activated"));
+ }
+
+ @Test
+ public void testNoVotings() throws Exception {
+ votingHandler1.analyzeVotings(resourceResolver);
+ }
+
+ private VotingView newVoting2(String newViewId, String initiatorId, String... liveInstances) throws Exception {
+ return VotingView.newVoting(resourceResolver, config, newViewId, initiatorId, new HashSet<String>(Arrays.asList(liveInstances)));
+ }
+
+ private VotingView newVoting(String initiatorId, String... liveInstances) throws Exception {
+ return newVoting2(UUID.randomUUID().toString(), initiatorId, liveInstances);
+ }
+
+ @Test
+ public void testPromotion() throws Exception {
+ VotingView voting = newVoting(slingId1, slingId1);
+ assertNotNull(voting);
+ VirtualInstanceHelper.dumpRepo(factory);
+ votingHandler1.activate(null);
+ Map<VotingView, VotingDetail> result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.PROMOTED, result.values().iterator().next());
+ result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(0, result.size());
+ }
+
+ @Test
+ public void testVotingYesTwoNodes() throws Exception {
+ VotingView voting = newVoting(slingId2, slingId1, slingId2);
+ assertNotNull(voting);
+ heartbeat(slingId1);
+ heartbeat(slingId2);
+ VirtualInstanceHelper.dumpRepo(factory);
+ votingHandler1.activate(null);
+ Map<VotingView, VotingDetail> result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.VOTED_YES, result.values().iterator().next());
+ result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.WINNING, result.values().iterator().next());
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.WINNING, result.values().iterator().next());
+ }
+
+ @Test
+ public void testVotingYesThreeNodes() throws Exception {
+ VotingView voting = newVoting(slingId2, slingId1, slingId2, slingId3);
+ assertNotNull(voting);
+ heartbeat(slingId1);
+ heartbeat(slingId2);
+ heartbeat(slingId3);
+ VirtualInstanceHelper.dumpRepo(factory);
+ votingHandler1.activate(null);
+ Map<VotingView, VotingDetail> result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.VOTED_YES, result.values().iterator().next());
+ result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.UNCHANGED, result.values().iterator().next());
+ }
+
+ @Test
+ public void testVotingYesFiveNodes() throws Exception {
+ VotingView voting = newVoting(slingId2, slingId1, slingId2, slingId3, slingId4, slingId5);
+ assertNotNull(voting);
+ heartbeat(slingId1);
+ heartbeat(slingId2);
+ heartbeat(slingId3);
+ heartbeat(slingId4);
+ heartbeat(slingId5);
+ VirtualInstanceHelper.dumpRepo(factory);
+ votingHandler1.activate(null);
+ Map<VotingView, VotingDetail> result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.VOTED_YES, result.values().iterator().next());
+ result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.UNCHANGED, result.values().iterator().next());
+ votingHandler3.activate(null);
+ result = votingHandler3.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.VOTED_YES, result.values().iterator().next());
+ result = votingHandler3.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.UNCHANGED, result.values().iterator().next());
+ votingHandler4.activate(null);
+ result = votingHandler4.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.VOTED_YES, result.values().iterator().next());
+ result = votingHandler4.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.UNCHANGED, result.values().iterator().next());
+ votingHandler5.activate(null);
+ result = votingHandler5.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.VOTED_YES, result.values().iterator().next());
+ result = votingHandler5.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.WINNING, result.values().iterator().next());
+ votingHandler2.activate(null);
+ result = votingHandler2.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.PROMOTED, result.values().iterator().next());
+ }
+
+ private void heartbeat(String slingId) throws Exception {
+ HeartbeatHandler hh = HeartbeatHandler.testConstructor(new DummySlingSettingsService(slingId), factory, null, null, config, null, votingHandler1);
+ OSGiMock.activate(hh);
+ HeartbeatHelper.issueClusterLocalHeartbeat(hh);
+ }
+
+ @Test
+ public void testTimedout() throws Exception {
+ config.setHeartbeatTimeout(1);
+ VotingView voting = newVoting(slingId1, slingId1);
+ assertNotNull(voting);
+ Thread.sleep(1200);
+ votingHandler1.activate(null);
+ Map<VotingView, VotingDetail> result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(1, result.size());
+ assertEquals(VotingDetail.TIMEDOUT, result.values().iterator().next());
+ result = votingHandler1.analyzeVotings(resourceResolver);
+ assertNotNull(result);
+ assertEquals(0, result.size());
+ }
+
+ private void asyncVote(final String debugInfo, final VotingHandler votingHandler, final List<VotingDetail> votingDetails, final Semaphore ready, final Semaphore go, final Semaphore done, final Set<Exception> exceptions) throws Exception {
+ Runnable r = new Runnable() {
+
+ @Override
+ public void run() {
+ try{
+ logger.info("asyncVote["+debugInfo+"] logging in...");
+ ResourceResolver rr = factory.getAdministrativeResourceResolver(null);
+ logger.info("asyncVote["+debugInfo+"] marking ready...");
+ ready.release();
+ logger.info("asyncVote["+debugInfo+"] waiting for go...");
+ go.acquire();
+ logger.info("asyncVote["+debugInfo+"] analyzeVotings...");
+ Map<VotingView, VotingDetail> result = votingHandler.analyzeVotings(rr);
+ logger.info("asyncVote["+debugInfo+"] done, asserting results...");
+ assertNotNull(result);
+ votingDetails.addAll(result.values());
+ rr.close();
+ logger.info("asyncVote["+debugInfo+"] marking done.");
+ done.release();
+ } catch(Exception e) {
+ exceptions.add(e);
+ }
+ }
+
+ };
+ threadPool.execute(r);
+ }
+
+ @Test
+ public void testConcurrentVotesSingleNode() throws Exception {
+ doTestConcurrentVotes(123, 12, votingHandler1);
+ }
+
+ @Test
+ public void testConcurrentVotesTwoNodes() throws Exception {
+ doTestConcurrentVotes(456, 12, votingHandler1, votingHandler2);
+ }
+
+ @Test
+ public void testConcurrentVotesThreeNodes() throws Exception {
+ doTestConcurrentVotes(234, 12, votingHandler1, votingHandler2, votingHandler3);
+ }
+
+ @Test
+ public void testConcurrentVotesFourNodes() throws Exception {
+ doTestConcurrentVotes(247, 12, votingHandler1, votingHandler2, votingHandler3, votingHandler4);
+ }
+
+ @Test
+ public void testConcurrentVotesFiveNodes() throws Exception {
+ doTestConcurrentVotes(285, 12, votingHandler1, votingHandler2, votingHandler3, votingHandler4, votingHandler5);
+ }
+
+ private void add(List<VotingDetail> votingDetails, Map<VotingDetail, Integer> totals) {
+ for (VotingDetail d : votingDetails) {
+ Integer i = totals.get(d);
+ if (i==null) {
+ i = 0;
+ }
+ i++;
+ totals.put(d, i);
+ }
+ }
+
+ private int count(List<VotingDetail> votingDetails, VotingDetail detail) {
+ int result = 0;
+ for (VotingDetail d : votingDetails) {
+ if (d.equals(detail)) {
+ result++;
+ }
+ }
+ return result;
+ }
+
+ public void doTestConcurrentVotes(int votingsLoopCnt, int perVotingInnerLoopCnt, VotingHandler... votingHandler) throws Exception {
+ config.setHeartbeatInterval(999);
+ config.setHeartbeatTimeout(120);
+
+ for (VotingHandler handler : votingHandler) {
+ handler.activate(null);
+ }
+
+ int[] totals = new int[votingHandler.length];
+
+ List<Map<VotingDetail,Integer>> totalDetails = new LinkedList<Map<VotingDetail,Integer>>();
+ for(int i=0; i<votingHandler.length; i++) {
+ HashMap<VotingDetail, Integer> d = new HashMap<VotingHandler.VotingDetail, Integer>();
+ totalDetails.add(d);
+ }
+
+ String[] slingIds = new String[votingHandler.length];
+ for(int k=0; k<votingHandler.length; k++) {
+ slingIds[k] = (String) PrivateAccessor.getField(votingHandler[k], "slingId");
+ }
+
+ for(int i=0; i<votingsLoopCnt; i++) { // large voting loop
+ logger.info("testConcurrentVotes: loop i="+i+", votingHandler.cnt="+votingHandler.length);
+
+ for(int k=0; k<votingHandler.length; k++) {
+ heartbeat(slingIds[k]);
+ }
+ for(int k=0; k<votingHandler.length; k++) {
+ String initiatorId = (String) PrivateAccessor.getField(votingHandler[k], "slingId");
+ VotingView voting = newVoting(initiatorId, slingIds);
+ assertNotNull(voting);
+ }
+ Semaphore ready = new Semaphore(0);
+ Semaphore go = new Semaphore(0);
+ Semaphore done = new Semaphore(0);
+ Set<Exception> e = new ConcurrentHashSet<Exception>();
+ boolean success = false;
+
+ List<List<VotingDetail>> detailList = new LinkedList<List<VotingDetail>>();
+ for(int k=0; k<votingHandler.length; k++) {
+ detailList.add(new LinkedList<VotingHandler.VotingDetail>());
+ }
+
+ for(int j=0; j<perVotingInnerLoopCnt; j++) {
+ logger.info("testConcurrentVotes: loop i="+i+", votingHandler.cnt="+votingHandler.length+", j="+j);
+ for(int k=0; k<votingHandler.length; k++) {
+ logger.info("testConcurrentVotes: <heartbeat for slingId,k="+k+"> loop i="+i+", votingHandler.cnt="+votingHandler.length+", j="+j);
+ heartbeat(slingIds[k]);
+ logger.info("testConcurrentVotes: <asyncVote for slingId,k="+k+"> loop i="+i+", votingHandler.cnt="+votingHandler.length+", j="+j);
+ asyncVote("k="+k, votingHandler[k], detailList.get(k), ready, go, done, e);
+ }
+ assertTrue("threads were not ready within 30sec", ready.tryAcquire(votingHandler.length, 30, TimeUnit.SECONDS));
+
+ // both are now ready, so lets go
+ logger.info("testConcurrentVotes: GO loop i="+i+", votingHandler.cnt="+votingHandler.length+", j="+j);
+ go.release(votingHandler.length);
+ assertTrue("threads were not done within 120sec", done.tryAcquire(votingHandler.length, 120, TimeUnit.SECONDS));
+ if (e.size()!=0) {
+ fail("Got exceptions: "+e.size()+", first: "+e.iterator().next());
+ }
+
+ int promotionTotalCount = 0;
+ int noTotalCount = 0;
+ for(int k=0; k<votingHandler.length; k++) {
+ int promotedCnt = count(detailList.get(k), VotingDetail.PROMOTED);
+ int noCnt = count(detailList.get(k), VotingDetail.VOTED_NO);
+ totals[k] += promotedCnt;
+ promotionTotalCount += promotedCnt;
+ noTotalCount += noCnt;
+ }
+ if (promotionTotalCount==0) {
+ continue; // should have 1 promotionTotalCount, if not, repeat
+ } else if (promotionTotalCount>1) {
+ fail("more than 1 promoted views: "+promotionTotalCount);
+ } else if (noTotalCount<votingHandler.length-1) {
+ continue; // should have votingHandler.length-1 no votes, if not, repeat
+ } else {
+ // done
+ success = true;
+ break;
+ }
+ }
+ assertTrue("did not promote within "+perVotingInnerLoopCnt+" loops", success);
+ for(int k=0; k<votingHandler.length; k++) {
+ add(detailList.get(k), totalDetails.get(k));
+ }
+
+ }
+ StringBuffer sb = new StringBuffer();
+ for(int k=0; k<votingHandler.length; k++) {
+ sb.append(" - by slingId");
+ sb.append(k+1);
+ sb.append(": ");
+ sb.append(totals[k]);
+ }
+
+ logger.info("testConcurrentVotes: promoted "+sb);
+ int totalPromotion = 0;
+ for(int k=0; k<votingHandler.length; k++) {
+ for (Map.Entry<VotingDetail, Integer> anEntry : totalDetails.get(k).entrySet()) {
+ logger.info("testConcurrentVotes: slingId"+(k+1)+", detail="+anEntry.getKey()+", value="+anEntry.getValue());
+ }
+ Integer noVotes = totalDetails.get(k).get(VotingDetail.VOTED_NO);
+ int expected = (votingHandler.length-1) * votingsLoopCnt;
+ if (expected>0) {
+ assertEquals(expected, (int)noVotes);
+ }
+ totalPromotion += totalDetails.get(k).get(VotingDetail.PROMOTED);
+ }
+ assertEquals((int)votingsLoopCnt, totalPromotion);
+ }
+
+}
diff --git a/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHelper.java b/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHelper.java
new file mode 100644
index 0000000..d52dde1
--- /dev/null
+++ b/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatHelper.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.discovery.impl.common.heartbeat;
+
+/**
+ * Friend class of HeartbeatHandler - to allow keeping certain
+ * methods protected
+ */
+public class HeartbeatHelper {
+
+ public static void issueClusterLocalHeartbeat(HeartbeatHandler hh) {
+ hh.issueClusterLocalHeartbeat();
+ }
+
+}
