Github user hsaputra commented on a diff in the pull request:
https://github.com/apache/incubator-twill/pull/52#discussion_r34409804
--- Diff:
twill-yarn/src/test/java/org/apache/twill/yarn/EchoServerTestRun.java ---
@@ -107,6 +112,30 @@ public void run() {
controller.changeInstances("EchoServer", 2);
Assert.assertTrue(waitForSize(echoServices, 2, 120));
+ // Test restart on instances for runnable
+
+ TimeUnit.SECONDS.sleep(6L);
--- End diff --
I could move the test to wait for right resource report and return null if
timeout reached and it always have the same containers.
```
@Test
public void testEchoServer() {
...
// Test restart on instances for runnable
Map<Integer, String> instanceIdToContainerId = Maps.newHashMap();
ResourceReport report = waitForResourceReport(controller, "EchoServer",
5L,
TimeUnit.SECONDS, 2, null);
Collection<TwillRunResources> runResources =
report.getRunnableResources("EchoServer");
for (TwillRunResources twillRunResources : runResources) {
instanceIdToContainerId.put(twillRunResources.getInstanceId(),
twillRunResources.getContainerId());
}
controller.restartAllInstances("EchoServer");
Assert.assertTrue(waitForSize(echoServices, 2, 120));
report = waitForResourceReport(controller, "EchoServer", 5L,
TimeUnit.SECONDS, 2,
instanceIdToContainerId);
Assert.assertTrue(report != null);
...
}
/**
* Need helper method here to wait for getting resource report because
{@link TwillController#getResourceReport()}
* could return null if the application has not fully started.
*
* To avoid sleep, if instanceIdToContainerId is passed, then compare
the container ids to ones before.
*/
@Nullable
private ResourceReport waitForResourceReport(TwillController controller,
String runnable, long timeout,
TimeUnit timeoutUnit,
int numOfResources,
@Nullable
Map<Integer, String> instanceIdToContainerId) {
Stopwatch stopwatch = new Stopwatch();
stopwatch.start();
do {
ResourceReport report = controller.getResourceReport();
if (report == null || report.getRunnableResources(runnable) == null) {
Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} else if (report.getRunnableResources(runnable) == null ||
report.getRunnableResources(runnable).size() != numOfResources) {
Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
} else {
if (instanceIdToContainerId == null) {
return report;
} else {
Collection<TwillRunResources> runResources =
report.getRunnableResources(runnable);
boolean isSameContainer = false;
for (TwillRunResources twillRunResources : runResources) {
int instanceId = twillRunResources.getInstanceId();
if
(twillRunResources.getContainerId().equals(instanceIdToContainerId.get(instanceId)))
{
// found same container id lets wait again.
isSameContainer = true;
break;
}
}
if (!isSameContainer) {
return report;
} else {
Uninterruptibles.sleepUninterruptibly(100,
TimeUnit.MILLISECONDS);
}
}
}
} while (stopwatch.elapsedTime(timeoutUnit) < timeout);
return null;
}
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
