Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12247: Ensure an event will contains newly added node

This commit is contained in:
Cao Manh Dat 2018-05-24 09:42:17 +07:00
parent 48bd259516
commit 71ed5bafac
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeAddedTriggerTest.java
View File

@ -272,19 +272,20 @@ public class NodeAddedTriggerTest extends SolrCloudTestCase {
try (NodeAddedTrigger newTrigger = new NodeAddedTrigger("node_added_trigger")) { try (NodeAddedTrigger newTrigger = new NodeAddedTrigger("node_added_trigger")) {
newTrigger.configure(container.getResourceLoader(), container.getZkController().getSolrCloudManager(), props); newTrigger.configure(container.getResourceLoader(), container.getZkController().getSolrCloudManager(), props);
newTrigger.init(); newTrigger.init();
AtomicBoolean fired = new AtomicBoolean(false); AtomicBoolean stop = new AtomicBoolean(false);
AtomicReference<TriggerEvent> eventRef = new AtomicReference<>(); AtomicReference<TriggerEvent> eventRef = new AtomicReference<>();
newTrigger.setProcessor(event -> { newTrigger.setProcessor(event -> {
if (fired.compareAndSet(false, true)) { //the processor may get called 2 times, for newly added node and initial nodes
eventRef.set(event);
long currentTimeNanos = timeSource.getTimeNs(); long currentTimeNanos = timeSource.getTimeNs();
long eventTimeNanos = event.getEventTime(); long eventTimeNanos = event.getEventTime();
long waitForNanos = TimeUnit.NANOSECONDS.convert(waitForSeconds, TimeUnit.SECONDS) - WAIT_FOR_DELTA_NANOS; long waitForNanos = TimeUnit.NANOSECONDS.convert(waitForSeconds, TimeUnit.SECONDS) - WAIT_FOR_DELTA_NANOS;
if (currentTimeNanos - eventTimeNanos <= waitForNanos) { if (currentTimeNanos - eventTimeNanos <= waitForNanos) {
fail("NodeAddedListener was fired before the configured waitFor period: currentTimeNanos=" + currentTimeNanos + ", eventTimeNanos=" + eventTimeNanos + ",waitForNanos=" + waitForNanos); fail("NodeAddedListener was fired before the configured waitFor period: currentTimeNanos=" + currentTimeNanos + ", eventTimeNanos=" + eventTimeNanos + ",waitForNanos=" + waitForNanos);
} }
} else { List<String> nodeNames = (List<String>) event.getProperty(NodeAddedTrigger.NodeAddedEvent.NODE_NAMES);
fail("NodeAddedTrigger was fired more than once!"); if (nodeNames.contains(newNode.getNodeName())) {
stop.set(true);
eventRef.set(event);
} }
return true; return true;
}); });
@ -296,15 +297,12 @@ public class NodeAddedTriggerTest extends SolrCloudTestCase {
if (counter++ > 10) { if (counter++ > 10) {
fail("Newly added node was not discovered by trigger even after 10 seconds"); fail("Newly added node was not discovered by trigger even after 10 seconds");
} }
} while (!fired.get()); } while (!stop.get());
// ensure the event was fired // ensure the event was fired
assertTrue(fired.get()); assertTrue(stop.get());
TriggerEvent nodeAddedEvent = eventRef.get(); TriggerEvent nodeAddedEvent = eventRef.get();
assertNotNull(nodeAddedEvent); assertNotNull(nodeAddedEvent);
List<String> nodeNames = (List<String>) nodeAddedEvent.getProperty(NodeAddedTrigger.NodeAddedEvent.NODE_NAMES);
assertTrue("Newly added node was not present in event message",
nodeNames.contains(newNode.getNodeName()));
} }
} }