You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by tm...@apache.org on 2014/11/18 21:27:28 UTC
incubator-reef git commit: This is for
[REEF-44](https://issues.apache.org/jira/browse/REEF-44). Currently.net
bridge java driver assumes that evaluators are only requested during startup
or when evaluator fails, this is a unnecessary constrain that bloc
Repository: incubator-reef
Updated Branches:
refs/heads/master c78e5bcd0 -> a15588f01
This is for [REEF-44](https://issues.apache.org/jira/browse/REEF-44). Currently.net bridge java driver assumes that evaluators are only requested during startup or when evaluator fails, this is a unnecessary constrain that blocks the scenario where elastic evaluaors allocation is needed. This commit removed that man-made constrain.
Closes #18
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/a15588f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/a15588f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/a15588f0
Branch: refs/heads/master
Commit: a15588f014b85789125e2ca45ae986a96d279b77
Parents: c78e5bc
Author: Yingda Chen <yd...@gmail.com>
Authored: Mon Nov 17 15:20:52 2014 -0800
Committer: tmajest <tm...@microsoft.com>
Committed: Tue Nov 18 12:25:49 2014 -0800
----------------------------------------------------------------------
.../apache/reef/javabridge/generic/JobDriver.java | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a15588f0/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
----------------------------------------------------------------------
diff --git a/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java b/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
index 16c6469..1022b51 100644
--- a/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
+++ b/reef-bridge-project/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java
@@ -117,7 +117,6 @@ public final class JobDriver {
private long driverRestartHandler = 0;
private long driverRestartActiveContextHandler = 0;
private long driverRestartRunningTaskHandler = 0;
- private int nCLREvaluators = 0;
private boolean clrBridgeSetup = false;
private boolean isRestarted = false;
@@ -218,8 +217,8 @@ public final class JobDriver {
private void submitEvaluator(final AllocatedEvaluator eval, EvaluatorType type) {
synchronized (JobDriver.this) {
eval.setType(type);
- LOG.log(Level.INFO, "Allocated Evaluator: {0} expect {1} running {2}",
- new Object[]{eval.getId(), JobDriver.this.nCLREvaluators, JobDriver.this.contexts.size()});
+ LOG.log(Level.INFO, "Allocated Evaluator: {0}, total running running {1}",
+ new Object[]{eval.getId(), JobDriver.this.contexts.size()});
if (JobDriver.this.allocatedEvaluatorHandler == 0) {
throw new RuntimeException("Allocated Evaluator Handler not initialized by CLR.");
}
@@ -255,10 +254,7 @@ public final class JobDriver {
try (final LoggingScope ls = loggingScopeFactory.evaluatorAllocated(allocatedEvaluator.getId())) {
synchronized (JobDriver.this) {
LOG.log(Level.INFO, "AllocatedEvaluatorHandler.OnNext");
- if (JobDriver.this.nCLREvaluators > 0) {
JobDriver.this.submitEvaluator(allocatedEvaluator, EvaluatorType.CLR);
- JobDriver.this.nCLREvaluators--;
- }
}
}
}
@@ -272,8 +268,8 @@ public final class JobDriver {
public void onNext(final ActiveContext context) {
try (final LoggingScope ls = loggingScopeFactory.activeContextReceived(context.getId())) {
synchronized (JobDriver.this) {
- LOG.log(Level.INFO, "ActiveContextHandler: Context available: {0} expect {1}",
- new Object[]{context.getId(), JobDriver.this.nCLREvaluators});
+ LOG.log(Level.INFO, "ActiveContextHandler: Context available: {0}",
+ new Object[]{context.getId()});
JobDriver.this.contexts.put(context.getId(), context);
JobDriver.this.submit(context);
}
@@ -360,7 +356,6 @@ public final class JobDriver {
NativeInterop.ClrSystemFailedEvaluatorHandlerOnNext(JobDriver.this.failedEvaluatorHandler, failedEvaluatorBridge, JobDriver.this.interopLogger);
int additionalRequestedEvaluatorNumber = failedEvaluatorBridge.getNewlyRequestedEvaluatorNumber();
if (additionalRequestedEvaluatorNumber > 0) {
- nCLREvaluators += additionalRequestedEvaluatorNumber;
LOG.log(Level.INFO, "number of additional evaluators requested after evaluator failure: " + additionalRequestedEvaluatorNumber);
}
JobDriver.this.jobMessageObserver.sendMessageToClient(message.getBytes());
@@ -526,8 +521,7 @@ public final class JobDriver {
EvaluatorRequestorBridge evaluatorRequestorBridge = new EvaluatorRequestorBridge(JobDriver.this.evaluatorRequestor, false, loggingScopeFactory);
NativeInterop.ClrSystemEvaluatorRequstorHandlerOnNext(JobDriver.this.evaluatorRequestorHandler, evaluatorRequestorBridge, JobDriver.this.interopLogger);
// get the evaluator numbers set by CLR handler
- nCLREvaluators += evaluatorRequestorBridge.getEvaluatorNumber();
- LOG.log(Level.INFO, "evaluator requested: " + nCLREvaluators);
+ LOG.log(Level.INFO, "evaluator requested at start up: " + evaluatorRequestorBridge.getEvaluatorNumber());
}
}
}