You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2013/06/13 17:54:42 UTC
svn commit: r1492718 [3/3] - in /hadoop/common/trunk/hadoop-yarn-project: ./
hadoop-yarn/dev-support/
hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/
had...
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/webapp/WebServer.java Thu Jun 13 15:54:38 2013
@@ -53,12 +53,7 @@ public class WebServer extends AbstractS
}
@Override
- public synchronized void init(Configuration conf) {
- super.init(conf);
- }
-
- @Override
- public synchronized void start() {
+ protected void serviceStart() throws Exception {
String bindAddress = getConfig().get(YarnConfiguration.NM_WEBAPP_ADDRESS,
YarnConfiguration.DEFAULT_NM_WEBAPP_ADDRESS);
LOG.info("Instantiating NMWebApp at " + bindAddress);
@@ -70,9 +65,9 @@ public class WebServer extends AbstractS
} catch (Exception e) {
String msg = "NMWebapps failed to start.";
LOG.error(msg, e);
- throw new YarnRuntimeException(msg);
+ throw new YarnRuntimeException(msg, e);
}
- super.start();
+ super.serviceStart();
}
public int getPort() {
@@ -80,11 +75,12 @@ public class WebServer extends AbstractS
}
@Override
- public synchronized void stop() {
+ protected void serviceStop() throws Exception {
if (this.webApp != null) {
+ LOG.debug("Stopping webapp");
this.webApp.stop();
}
- super.stop();
+ super.serviceStop();
}
public static class NMWebApp extends WebApp implements YarnWebParams {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDeletionService.java Thu Jun 13 15:54:38 2013
@@ -138,9 +138,9 @@ public class TestDeletionService {
}
DeletionService del =
new DeletionService(new FakeDefaultContainerExecutor());
- del.init(new Configuration());
- del.start();
try {
+ del.init(new Configuration());
+ del.start();
for (Path p : content) {
assertTrue(lfs.util().exists(new Path(baseDirs.get(0), p)));
del.delete((Long.parseLong(p.getName()) % 2) == 0 ? null : "dingo",
@@ -176,9 +176,9 @@ public class TestDeletionService {
conf.setInt(YarnConfiguration.DEBUG_NM_DELETE_DELAY_SEC, -1);
exec.setConf(conf);
DeletionService del = new DeletionService(exec);
- del.init(conf);
- del.start();
try {
+ del.init(conf);
+ del.start();
for (Path p : dirs) {
del.delete((Long.parseLong(p.getName()) % 2) == 0 ? null : "dingo", p,
null);
@@ -201,9 +201,9 @@ public class TestDeletionService {
DeletionService del = new DeletionService(Mockito.mock(ContainerExecutor.class));
Configuration conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.DEBUG_NM_DELETE_DELAY_SEC, 60);
- del.init(conf);
- del.start();
try {
+ del.init(conf);
+ del.start();
del.delete("dingo", new Path("/does/not/exist"));
} finally {
del.stop();
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java Thu Jun 13 15:54:38 2013
@@ -73,7 +73,8 @@ public class TestLocalDirsHandlerService
Assert.fail("Service should have thrown an exception due to wrong URI");
} catch (YarnRuntimeException e) {
}
- Assert.assertTrue("Service should not be inited", dirSvc.getServiceState()
- .compareTo(STATE.NOTINITED) == 0);
+ Assert.assertEquals("Service should not be inited",
+ STATE.STOPPED,
+ dirSvc.getServiceState());
}
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManager.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManager.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManager.java Thu Jun 13 15:54:38 2013
@@ -49,6 +49,8 @@ public class TestNodeManager {
} catch (YarnRuntimeException e) {
//PASS
assert(e.getCause().getMessage().contains("dummy executor init called"));
+ } finally {
+ nm.stop();
}
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java Thu Jun 13 15:54:38 2013
@@ -83,6 +83,7 @@ public class TestNodeManagerShutdown {
static final String user = "nobody";
private FileContext localFS;
private ContainerId cId;
+ private NodeManager nm;
@Before
public void setup() throws UnsupportedFileSystemException {
@@ -98,13 +99,16 @@ public class TestNodeManagerShutdown {
@After
public void tearDown() throws IOException, InterruptedException {
+ if (nm != null) {
+ nm.stop();
+ }
localFS.delete(new Path(basedir.getPath()), true);
}
@Test
public void testKillContainersOnShutdown() throws IOException,
YarnException {
- NodeManager nm = new TestNodeManager();
+ nm = new TestNodeManager();
nm.init(createNMConfig());
nm.start();
startContainer(nm, cId, localFS, tmpDir, processStartFile);
@@ -272,4 +276,4 @@ public class TestNodeManagerShutdown {
getNMContext().getContainerTokenSecretManager().setMasterKey(masterKey);
}
}
-}
\ No newline at end of file
+}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java Thu Jun 13 15:54:38 2013
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.logging.Log;
@@ -78,8 +79,8 @@ import org.apache.hadoop.yarn.server.nod
import org.apache.hadoop.yarn.server.security.ApplicationACLsManager;
import org.apache.hadoop.yarn.server.utils.BuilderUtils;
import org.apache.hadoop.yarn.server.utils.YarnServerBuilderUtils;
-import org.apache.hadoop.yarn.service.Service;
import org.apache.hadoop.yarn.service.Service.STATE;
+import org.apache.hadoop.yarn.service.ServiceOperations;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -110,9 +111,7 @@ public class TestNodeStatusUpdater {
public void tearDown() {
this.registeredNodes.clear();
heartBeatID = 0;
- if (nm != null && nm.getServiceState() == STATE.STARTED) {
- nm.stop();
- }
+ ServiceOperations.stop(nm);
DefaultMetricsSystem.shutdown();
}
@@ -316,9 +315,11 @@ public class TestNodeStatusUpdater {
public ResourceTracker resourceTracker =
new MyResourceTracker(this.context);
private Context context;
- private final long waitStartTime;
+ private long waitStartTime;
private final long rmStartIntervalMS;
private final boolean rmNeverStart;
+ private volatile boolean triggered = false;
+ private long durationWhenTriggered = -1;
public MyNodeStatusUpdater4(Context context, Dispatcher dispatcher,
NodeHealthCheckerService healthChecker, NodeManagerMetrics metrics,
@@ -331,14 +332,50 @@ public class TestNodeStatusUpdater {
}
@Override
+ protected void serviceStart() throws Exception {
+ //record the startup time
+ this.waitStartTime = System.currentTimeMillis();
+ super.serviceStart();
+ }
+
+ @Override
protected ResourceTracker getRMClient() {
- if(System.currentTimeMillis() - waitStartTime <= rmStartIntervalMS
- || rmNeverStart) {
- throw new YarnRuntimeException("Faking RM start failure as start " +
- "delay timer has not expired.");
- } else {
- return resourceTracker;
+ if (!triggered) {
+ long t = System.currentTimeMillis();
+ long duration = t - waitStartTime;
+ if (duration <= rmStartIntervalMS
+ || rmNeverStart) {
+ throw new YarnRuntimeException("Faking RM start failure as start " +
+ "delay timer has not expired.");
+ } else {
+ //triggering
+ triggered = true;
+ durationWhenTriggered = duration;
+ }
}
+ return resourceTracker;
+ }
+
+ private boolean isTriggered() {
+ return triggered;
+ }
+
+ private long getWaitStartTime() {
+ return waitStartTime;
+ }
+
+ private long getDurationWhenTriggered() {
+ return durationWhenTriggered;
+ }
+
+ @Override
+ public String toString() {
+ return "MyNodeStatusUpdater4{" +
+ "rmNeverStart=" + rmNeverStart +
+ ", triggered=" + triggered +
+ ", duration=" + durationWhenTriggered +
+ ", rmStartIntervalMS=" + rmStartIntervalMS +
+ '}';
}
}
@@ -390,13 +427,10 @@ public class TestNodeStatusUpdater {
}
@Override
- public void stop() {
- super.stop();
+ protected void serviceStop() throws Exception {
+ super.serviceStop();
isStopped = true;
- try {
- syncBarrier.await();
- } catch (Exception e) {
- }
+ syncBarrier.await(10000, TimeUnit.MILLISECONDS);
}
}
//
@@ -580,7 +614,9 @@ public class TestNodeStatusUpdater {
nodeStatus.setResponseId(heartBeatID);
NodeHeartbeatResponse nhResponse =
YarnServerBuilderUtils.newNodeHeartbeatResponse(heartBeatID,
- heartBeatNodeAction, null, null, null, 1000L);
+ heartBeatNodeAction,
+ null, null, null,
+ 1000L);
return nhResponse;
}
}
@@ -724,7 +760,7 @@ public class TestNodeStatusUpdater {
Assert.assertEquals(STATE.STOPPED, nm.getServiceState());
Assert.assertEquals(numCleanups.get(), 1);
}
-
+
@Test
public void testNodeDecommision() throws Exception {
nm = getNodeManager(NodeAction.SHUTDOWN);
@@ -749,12 +785,35 @@ public class TestNodeStatusUpdater {
Assert.assertEquals(STATE.STOPPED, nm.getServiceState());
}
+ private abstract class NodeManagerWithCustomNodeStatusUpdater extends NodeManager {
+ private NodeStatusUpdater updater;
+
+ private NodeManagerWithCustomNodeStatusUpdater() {
+ }
+
+ @Override
+ protected NodeStatusUpdater createNodeStatusUpdater(Context context,
+ Dispatcher dispatcher,
+ NodeHealthCheckerService healthChecker) {
+ updater = createUpdater(context, dispatcher, healthChecker);
+ return updater;
+ }
+
+ public NodeStatusUpdater getUpdater() {
+ return updater;
+ }
+
+ abstract NodeStatusUpdater createUpdater(Context context,
+ Dispatcher dispatcher,
+ NodeHealthCheckerService healthChecker);
+ }
+
@Test
- public void testNMShutdownForRegistrationFailure() {
+ public void testNMShutdownForRegistrationFailure() throws Exception {
- nm = new NodeManager() {
+ nm = new NodeManagerWithCustomNodeStatusUpdater() {
@Override
- protected NodeStatusUpdater createNodeStatusUpdater(Context context,
+ protected NodeStatusUpdater createUpdater(Context context,
Dispatcher dispatcher, NodeHealthCheckerService healthChecker) {
MyNodeStatusUpdater nodeStatusUpdater = new MyNodeStatusUpdater(
context, dispatcher, healthChecker, metrics);
@@ -765,14 +824,14 @@ public class TestNodeStatusUpdater {
return nodeStatusUpdater;
}
};
- verifyNodeStartFailure("org.apache.hadoop.yarn.YarnRuntimeException: "
- + "Recieved SHUTDOWN signal from Resourcemanager ,"
+ verifyNodeStartFailure(
+ "Recieved SHUTDOWN signal from Resourcemanager ,"
+ "Registration of NodeManager failed, "
+ "Message from ResourceManager: RM Shutting Down Node");
}
@Test (timeout = 150000)
- public void testNMConnectionToRM() {
+ public void testNMConnectionToRM() throws Exception {
final long delta = 50000;
final long connectionWaitSecs = 5;
final long connectionRetryIntervalSecs = 1;
@@ -786,9 +845,10 @@ public class TestNodeStatusUpdater {
connectionRetryIntervalSecs);
//Test NM try to connect to RM Several times, but finally fail
- nm = new NodeManager() {
+ NodeManagerWithCustomNodeStatusUpdater nmWithUpdater;
+ nm = nmWithUpdater = new NodeManagerWithCustomNodeStatusUpdater() {
@Override
- protected NodeStatusUpdater createNodeStatusUpdater(Context context,
+ protected NodeStatusUpdater createUpdater(Context context,
Dispatcher dispatcher, NodeHealthCheckerService healthChecker) {
NodeStatusUpdater nodeStatusUpdater = new MyNodeStatusUpdater4(
context, dispatcher, healthChecker, metrics,
@@ -802,19 +862,25 @@ public class TestNodeStatusUpdater {
nm.start();
Assert.fail("NM should have failed to start due to RM connect failure");
} catch(Exception e) {
- Assert.assertTrue("NM should have tried re-connecting to RM during " +
+ long t = System.currentTimeMillis();
+ long duration = t - waitStartTime;
+ boolean waitTimeValid = (duration >= connectionWaitSecs * 1000)
+ && (duration < (connectionWaitSecs * 1000 + delta));
+ if(!waitTimeValid) {
+ //either the exception was too early, or it had a different cause.
+ //reject with the inner stack trace
+ throw new Exception("NM should have tried re-connecting to RM during " +
"period of at least " + connectionWaitSecs + " seconds, but " +
"stopped retrying within " + (connectionWaitSecs + delta/1000) +
- " seconds", (System.currentTimeMillis() - waitStartTime
- >= connectionWaitSecs*1000) && (System.currentTimeMillis()
- - waitStartTime < (connectionWaitSecs*1000+delta)));
+ " seconds: " + e, e);
+ }
}
//Test NM connect to RM, fail at first several attempts,
//but finally success.
- nm = new NodeManager() {
+ nm = nmWithUpdater = new NodeManagerWithCustomNodeStatusUpdater() {
@Override
- protected NodeStatusUpdater createNodeStatusUpdater(Context context,
+ protected NodeStatusUpdater createUpdater(Context context,
Dispatcher dispatcher, NodeHealthCheckerService healthChecker) {
NodeStatusUpdater nodeStatusUpdater = new MyNodeStatusUpdater4(
context, dispatcher, healthChecker, metrics, rmStartIntervalMS,
@@ -822,20 +888,33 @@ public class TestNodeStatusUpdater {
return nodeStatusUpdater;
}
};
-
nm.init(conf);
+ NodeStatusUpdater updater = nmWithUpdater.getUpdater();
+ Assert.assertNotNull("Updater not yet created ", updater);
waitStartTime = System.currentTimeMillis();
try {
nm.start();
} catch (Exception ex){
- Assert.fail("NM should have started successfully " +
- "after connecting to RM.");
- }
- Assert.assertTrue("NM should have connected to RM within " + delta/1000
- +" seconds of RM starting up.",
- (System.currentTimeMillis() - waitStartTime >= rmStartIntervalMS)
- && (System.currentTimeMillis() - waitStartTime
- < (rmStartIntervalMS+delta)));
+ LOG.error("NM should have started successfully " +
+ "after connecting to RM.", ex);
+ throw ex;
+ }
+ long duration = System.currentTimeMillis() - waitStartTime;
+ MyNodeStatusUpdater4 myUpdater = (MyNodeStatusUpdater4) updater;
+ Assert.assertTrue("Updater was never started",
+ myUpdater.getWaitStartTime()>0);
+ Assert.assertTrue("NM started before updater triggered",
+ myUpdater.isTriggered());
+ Assert.assertTrue("NM should have connected to RM after "
+ +"the start interval of " + rmStartIntervalMS
+ +": actual " + duration
+ + " " + myUpdater,
+ (duration >= rmStartIntervalMS));
+ Assert.assertTrue("NM should have connected to RM less than "
+ + (rmStartIntervalMS + delta)
+ +" milliseconds of RM starting up: actual " + duration
+ + " " + myUpdater,
+ (duration < (rmStartIntervalMS + delta)));
}
/**
@@ -846,7 +925,7 @@ public class TestNodeStatusUpdater {
* only after NM_EXPIRY interval. See MAPREDUCE-2749.
*/
@Test
- public void testNoRegistrationWhenNMServicesFail() {
+ public void testNoRegistrationWhenNMServicesFail() throws Exception {
nm = new NodeManager() {
@Override
@@ -865,7 +944,7 @@ public class TestNodeStatusUpdater {
return new ContainerManagerImpl(context, exec, del, nodeStatusUpdater,
metrics, aclsManager, diskhandler) {
@Override
- public void start() {
+ protected void serviceStart() {
// Simulating failure of starting RPC server
throw new YarnRuntimeException("Starting of RPC Server failed");
}
@@ -961,7 +1040,7 @@ public class TestNodeStatusUpdater {
nm.init(conf);
nm.start();
try {
- syncBarrier.await();
+ syncBarrier.await(10000, TimeUnit.MILLISECONDS);
} catch (Exception e) {
}
Assert.assertTrue(((MyNodeManager2) nm).isStopped);
@@ -1053,20 +1132,25 @@ public class TestNodeStatusUpdater {
}
}
- private void verifyNodeStartFailure(String errMessage) {
+ private void verifyNodeStartFailure(String errMessage) throws Exception {
+ Assert.assertNotNull("nm is null", nm);
YarnConfiguration conf = createNMConfig();
nm.init(conf);
try {
nm.start();
Assert.fail("NM should have failed to start. Didn't get exception!!");
} catch (Exception e) {
- Assert.assertEquals(errMessage, e.getCause()
- .getMessage());
+ //the version in trunk looked in the cause for equality
+ // and assumed failures were nested.
+ //this version assumes that error strings propagate to the base and
+ //use a contains() test only. It should be less brittle
+ if(!e.getMessage().contains(errMessage)) {
+ throw e;
+ }
}
- // the state change to stopped occurs only if the startup is success, else
- // state change doesn't occur
- Assert.assertEquals("NM state is wrong!", Service.STATE.INITED, nm
+ // the service should be stopped
+ Assert.assertEquals("NM state is wrong!", STATE.STOPPED, nm
.getServiceState());
Assert.assertEquals("Number of registered nodes is wrong!", 0,
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java Thu Jun 13 15:54:38 2013
@@ -202,8 +202,7 @@ public abstract class BaseContainerManag
@After
public void tearDown() throws IOException, InterruptedException {
- if (containerManager != null
- && containerManager.getServiceState() == STATE.STARTED) {
+ if (containerManager != null) {
containerManager.stop();
}
createContainerExecutor().deleteAsUser(user,
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java Thu Jun 13 15:54:38 2013
@@ -63,20 +63,20 @@ public class TestAuxServices {
}
public ArrayList<Integer> getAppIdsStopped() {
- return (ArrayList)this.stoppedApps.clone();
+ return (ArrayList<Integer>)this.stoppedApps.clone();
}
- @Override
- public void init(Configuration conf) {
+ @Override
+ protected void serviceInit(Configuration conf) throws Exception {
remaining_init = conf.getInt(idef + ".expected.init", 0);
remaining_stop = conf.getInt(idef + ".expected.stop", 0);
- super.init(conf);
+ super.serviceInit(conf);
}
@Override
- public void stop() {
+ protected void serviceStop() throws Exception {
assertEquals(0, remaining_init);
assertEquals(0, remaining_stop);
- super.stop();
+ super.serviceStop();
}
@Override
public void initApp(String user, ApplicationId appId, ByteBuffer data) {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java Thu Jun 13 15:54:38 2013
@@ -237,7 +237,7 @@ public class TestResourceLocalizationSer
dirsHandler.init(conf);
DeletionService delService = new DeletionService(exec);
- delService.init(null);
+ delService.init(new Configuration());
delService.start();
ResourceLocalizationService rawService =
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestNMWebServer.java Thu Jun 13 15:54:38 2013
@@ -104,21 +104,32 @@ public class TestNMWebServer {
conf.set(YarnConfiguration.NM_WEBAPP_ADDRESS, webAddr);
WebServer server = new WebServer(nmContext, resourceView,
new ApplicationACLsManager(conf), dirsHandler);
- server.init(conf);
- server.start();
- return server.getPort();
+ try {
+ server.init(conf);
+ server.start();
+ return server.getPort();
+ } finally {
+ server.stop();
+ healthChecker.stop();
+ }
}
@Test
public void testNMWebAppWithOutPort() throws IOException {
int port = startNMWebAppServer("0.0.0.0");
- Assert.assertTrue("Port is not updated", port > 0);
+ validatePortVal(port);
}
-
+
+ private void validatePortVal(int portVal) {
+ Assert.assertTrue("Port is not updated", portVal > 0);
+ Assert.assertTrue("Port is default "+ YarnConfiguration.DEFAULT_NM_PORT,
+ portVal !=YarnConfiguration.DEFAULT_NM_PORT);
+ }
+
@Test
public void testNMWebAppWithEphemeralPort() throws IOException {
int port = startNMWebAppServer("0.0.0.0:0");
- Assert.assertTrue("Port is not updated", port > 0);
+ validatePortVal(port);
}
@Test
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java Thu Jun 13 15:54:38 2013
@@ -92,8 +92,7 @@ public class AdminService extends Abstra
}
@Override
- public void init(Configuration conf) {
- super.init(conf);
+ public void serviceInit(Configuration conf) throws Exception {
masterServiceAddress = conf.getSocketAddr(
YarnConfiguration.RM_ADMIN_ADDRESS,
YarnConfiguration.DEFAULT_RM_ADMIN_ADDRESS,
@@ -101,9 +100,11 @@ public class AdminService extends Abstra
adminAcl = new AccessControlList(conf.get(
YarnConfiguration.YARN_ADMIN_ACL,
YarnConfiguration.DEFAULT_YARN_ADMIN_ACL));
+ super.serviceInit(conf);
}
- public void start() {
+ @Override
+ protected void serviceStart() throws Exception {
Configuration conf = getConfig();
YarnRPC rpc = YarnRPC.create(conf);
this.server =
@@ -122,15 +123,15 @@ public class AdminService extends Abstra
this.server.start();
conf.updateConnectAddr(YarnConfiguration.RM_ADMIN_ADDRESS,
server.getListenerAddress());
- super.start();
+ super.serviceStart();
}
@Override
- public void stop() {
+ protected void serviceStop() throws Exception {
if (this.server != null) {
this.server.stop();
}
- super.stop();
+ super.serviceStop();
}
private UserGroupInformation checkAcls(String method) throws YarnException {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java Thu Jun 13 15:54:38 2013
@@ -107,7 +107,7 @@ public class ApplicationMasterService ex
}
@Override
- public void start() {
+ protected void serviceStart() throws Exception {
Configuration conf = getConfig();
YarnRPC rpc = YarnRPC.create(conf);
@@ -133,7 +133,7 @@ public class ApplicationMasterService ex
this.bindAddress =
conf.updateConnectAddr(YarnConfiguration.RM_SCHEDULER_ADDRESS,
server.getListenerAddress());
- super.start();
+ super.serviceStart();
}
@Private
@@ -447,10 +447,10 @@ public class ApplicationMasterService ex
}
@Override
- public void stop() {
+ protected void serviceStop() throws Exception {
if (this.server != null) {
this.server.stop();
}
- super.stop();
+ super.serviceStop();
}
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java Thu Jun 13 15:54:38 2013
@@ -128,13 +128,13 @@ public class ClientRMService extends Abs
}
@Override
- public void init(Configuration conf) {
+ protected void serviceInit(Configuration conf) throws Exception {
clientBindAddress = getBindAddress(conf);
- super.init(conf);
+ super.serviceInit(conf);
}
@Override
- public void start() {
+ protected void serviceStart() throws Exception {
Configuration conf = getConfig();
YarnRPC rpc = YarnRPC.create(conf);
this.server =
@@ -157,16 +157,15 @@ public class ClientRMService extends Abs
// enable RM to short-circuit token operations directly to itself
RMDelegationTokenIdentifier.Renewer.setSecretManager(
rmDTSecretManager, clientBindAddress);
-
- super.start();
+ super.serviceStart();
}
@Override
- public void stop() {
+ protected void serviceStop() throws Exception {
if (this.server != null) {
this.server.stop();
}
- super.stop();
+ super.serviceStop();
}
InetSocketAddress getBindAddress(Configuration conf) {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NMLivelinessMonitor.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NMLivelinessMonitor.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NMLivelinessMonitor.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NMLivelinessMonitor.java Thu Jun 13 15:54:38 2013
@@ -37,12 +37,12 @@ public class NMLivelinessMonitor extends
this.dispatcher = d.getEventHandler();
}
- public void init(Configuration conf) {
- super.init(conf);
+ public void serviceInit(Configuration conf) throws Exception {
int expireIntvl = conf.getInt(YarnConfiguration.RM_NM_EXPIRY_INTERVAL_MS,
YarnConfiguration.DEFAULT_RM_NM_EXPIRY_INTERVAL_MS);
setExpireInterval(expireIntvl);
setMonitorInterval(expireIntvl/3);
+ super.serviceInit(conf);
}
@Override
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java Thu Jun 13 15:54:38 2013
@@ -57,7 +57,7 @@ public class NodesListManager extends Ab
}
@Override
- public void init(Configuration conf) {
+ protected void serviceInit(Configuration conf) throws Exception {
this.conf = conf;
@@ -83,7 +83,7 @@ public class NodesListManager extends Ab
throw new YarnRuntimeException(ioe2);
}
}
- super.init(conf);
+ super.serviceInit(conf);
}
private void printConfiguredHosts() {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java Thu Jun 13 15:54:38 2013
@@ -137,7 +137,7 @@ public class ResourceManager extends Com
}
@Override
- public synchronized void init(Configuration conf) {
+ protected void serviceInit(Configuration conf) throws Exception {
validateConfigs(conf);
@@ -257,7 +257,7 @@ public class ResourceManager extends Com
new RMNMInfo(this.rmContext, this.scheduler);
- super.init(conf);
+ super.serviceInit(conf);
}
@VisibleForTesting
@@ -398,17 +398,17 @@ public class ResourceManager extends Com
}
@Override
- public synchronized void init(Configuration conf) {
+ protected void serviceInit(Configuration conf) throws Exception {
this.shouldExitOnError =
conf.getBoolean(Dispatcher.DISPATCHER_EXIT_ON_ERROR_KEY,
Dispatcher.DEFAULT_DISPATCHER_EXIT_ON_ERROR);
- super.init(conf);
+ super.serviceInit(conf);
}
@Override
- public synchronized void start() {
+ protected void serviceStart() throws Exception {
this.eventProcessor.start();
- super.start();
+ super.serviceStart();
}
private final class EventProcessor implements Runnable {
@@ -448,7 +448,7 @@ public class ResourceManager extends Com
}
@Override
- public synchronized void stop() {
+ protected void serviceStop() throws Exception {
this.stopped = true;
this.eventProcessor.interrupt();
try {
@@ -456,7 +456,7 @@ public class ResourceManager extends Com
} catch (InterruptedException e) {
throw new YarnRuntimeException(e);
}
- super.stop();
+ super.serviceStop();
}
@Override
@@ -577,7 +577,7 @@ public class ResourceManager extends Com
}
@Override
- public void start() {
+ protected void serviceStart() throws Exception {
try {
doSecureLogin();
} catch(IOException ie) {
@@ -616,7 +616,7 @@ public class ResourceManager extends Com
conf.set(YarnConfiguration.RM_WEBAPP_ADDRESS, resolvedAddress);
}
- super.start();
+ super.serviceStart();
/*synchronized(shutdown) {
try {
@@ -635,14 +635,20 @@ public class ResourceManager extends Com
}
@Override
- public void stop() {
+ protected void serviceStop() throws Exception {
if (webApp != null) {
webApp.stop();
}
- rmDTSecretManager.stopThreads();
+ if (rmDTSecretManager != null) {
+ rmDTSecretManager.stopThreads();
+ }
- this.appTokenSecretManager.stop();
- this.containerTokenSecretManager.stop();
+ if (appTokenSecretManager != null) {
+ this.appTokenSecretManager.stop();
+ }
+ if (containerTokenSecretManager != null) {
+ this.containerTokenSecretManager.stop();
+ }
/*synchronized(shutdown) {
shutdown.set(true);
@@ -651,14 +657,16 @@ public class ResourceManager extends Com
DefaultMetricsSystem.shutdown();
- RMStateStore store = rmContext.getStateStore();
- try {
- store.close();
- } catch (Exception e) {
- LOG.error("Error closing store.", e);
+ if (rmContext != null) {
+ RMStateStore store = rmContext.getStateStore();
+ try {
+ store.close();
+ } catch (Exception e) {
+ LOG.error("Error closing store.", e);
+ }
}
-
- super.stop();
+
+ super.serviceStop();
}
protected ResourceTrackerService createResourceTrackerService() {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java Thu Jun 13 15:54:38 2013
@@ -99,7 +99,7 @@ public class ResourceTrackerService exte
}
@Override
- public synchronized void init(Configuration conf) {
+ protected void serviceInit(Configuration conf) throws Exception {
resourceTrackerAddress = conf.getSocketAddr(
YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
YarnConfiguration.DEFAULT_RM_RESOURCE_TRACKER_ADDRESS,
@@ -122,12 +122,12 @@ public class ResourceTrackerService exte
YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES,
YarnConfiguration.DEFAULT_RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES);
- super.init(conf);
+ super.serviceInit(conf);
}
@Override
- public synchronized void start() {
- super.start();
+ protected void serviceStart() throws Exception {
+ super.serviceStart();
// ResourceTrackerServer authenticates NodeManager via Kerberos if
// security is enabled, so no secretManager.
Configuration conf = getConfig();
@@ -151,11 +151,11 @@ public class ResourceTrackerService exte
}
@Override
- public synchronized void stop() {
+ protected void serviceStop() throws Exception {
if (this.server != null) {
this.server.stop();
}
- super.stop();
+ super.serviceStop();
}
@SuppressWarnings("unchecked")
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java Thu Jun 13 15:54:38 2013
@@ -50,9 +50,10 @@ public class ApplicationMasterLauncher e
this.launcherHandlingThread = new LauncherThread();
}
- public void start() {
+ @Override
+ protected void serviceStart() throws Exception {
launcherHandlingThread.start();
- super.start();
+ super.serviceStart();
}
protected Runnable createRunnableLauncher(RMAppAttempt application,
@@ -69,7 +70,8 @@ public class ApplicationMasterLauncher e
}
- public void stop() {
+ @Override
+ protected void serviceStop() throws Exception {
launcherHandlingThread.interrupt();
try {
launcherHandlingThread.join();
@@ -77,7 +79,6 @@ public class ApplicationMasterLauncher e
LOG.info(launcherHandlingThread.getName() + " interrupted during join ",
ie); }
launcherPool.shutdown();
- super.stop();
}
private class LauncherThread extends Thread {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AMLivelinessMonitor.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AMLivelinessMonitor.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AMLivelinessMonitor.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/AMLivelinessMonitor.java Thu Jun 13 15:54:38 2013
@@ -35,8 +35,8 @@ public class AMLivelinessMonitor extends
this.dispatcher = d.getEventHandler();
}
- public void init(Configuration conf) {
- super.init(conf);
+ public void serviceInit(Configuration conf) throws Exception {
+ super.serviceInit(conf);
int expireIntvl = conf.getInt(YarnConfiguration.RM_AM_EXPIRY_INTERVAL_MS,
YarnConfiguration.DEFAULT_RM_AM_EXPIRY_INTERVAL_MS);
setExpireInterval(expireIntvl);
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpirer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpirer.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpirer.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmcontainer/ContainerAllocationExpirer.java Thu Jun 13 15:54:38 2013
@@ -38,13 +38,13 @@ public class ContainerAllocationExpirer
this.dispatcher = d.getEventHandler();
}
- public void init(Configuration conf) {
- super.init(conf);
+ public void serviceInit(Configuration conf) throws Exception {
int expireIntvl = conf.getInt(
YarnConfiguration.RM_CONTAINER_ALLOC_EXPIRY_INTERVAL_MS,
YarnConfiguration.DEFAULT_RM_CONTAINER_ALLOC_EXPIRY_INTERVAL_MS);
setExpireInterval(expireIntvl);
setMonitorInterval(expireIntvl/3);
+ super.serviceInit(conf);
}
@Override
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java Thu Jun 13 15:54:38 2013
@@ -88,19 +88,18 @@ public class DelegationTokenRenewer exte
}
@Override
- public synchronized void init(Configuration conf) {
- super.init(conf);
+ protected synchronized void serviceInit(Configuration conf) throws Exception {
this.tokenKeepAliveEnabled =
conf.getBoolean(YarnConfiguration.LOG_AGGREGATION_ENABLED,
YarnConfiguration.DEFAULT_LOG_AGGREGATION_ENABLED);
this.tokenRemovalDelayMs =
conf.getInt(YarnConfiguration.RM_NM_EXPIRY_INTERVAL_MS,
YarnConfiguration.DEFAULT_RM_NM_EXPIRY_INTERVAL_MS);
+ super.serviceInit(conf);
}
@Override
- public synchronized void start() {
- super.start();
+ protected void serviceStart() throws Exception {
dtCancelThread.start();
renewalTimer = new Timer(true);
@@ -110,10 +109,11 @@ public class DelegationTokenRenewer exte
"DelayedTokenCanceller");
delayedRemovalThread.start();
}
+ super.serviceStart();
}
@Override
- public synchronized void stop() {
+ protected void serviceStop() {
if (renewalTimer != null) {
renewalTimer.cancel();
}
@@ -133,8 +133,6 @@ public class DelegationTokenRenewer exte
LOG.info("Interrupted while joining on delayed removal thread.", e);
}
}
-
- super.stop();
}
/**
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java Thu Jun 13 15:54:38 2013
@@ -293,12 +293,12 @@ public class MockRM extends ResourceMana
return new ClientRMService(getRMContext(), getResourceScheduler(),
rmAppManager, applicationACLsManager, rmDTSecretManager) {
@Override
- public void start() {
+ protected void serviceStart() {
// override to not start rpc handler
}
@Override
- public void stop() {
+ protected void serviceStop() {
// don't do anything
}
};
@@ -313,12 +313,12 @@ public class MockRM extends ResourceMana
this.nmLivelinessMonitor, containerTokenSecretManager) {
@Override
- public void start() {
+ protected void serviceStart() {
// override to not start rpc handler
}
@Override
- public void stop() {
+ protected void serviceStop() {
// don't do anything
}
};
@@ -328,12 +328,12 @@ public class MockRM extends ResourceMana
protected ApplicationMasterService createApplicationMasterService() {
return new ApplicationMasterService(getRMContext(), scheduler) {
@Override
- public void start() {
+ protected void serviceStart() {
// override to not start rpc handler
}
@Override
- public void stop() {
+ protected void serviceStop() {
// don't do anything
}
};
@@ -343,7 +343,7 @@ public class MockRM extends ResourceMana
protected ApplicationMasterLauncher createAMLauncher() {
return new ApplicationMasterLauncher(getRMContext()) {
@Override
- public void start() {
+ protected void serviceStart() {
// override to not start rpc handler
}
@@ -353,7 +353,7 @@ public class MockRM extends ResourceMana
}
@Override
- public void stop() {
+ protected void serviceStop() {
// don't do anything
}
};
@@ -367,12 +367,12 @@ public class MockRM extends ResourceMana
this.nodesListManager, clientRMService, applicationMasterService,
resourceTrackerService) {
@Override
- public void start() {
+ protected void serviceStart() {
// override to not start rpc handler
}
@Override
- public void stop() {
+ protected void serviceStop() {
// don't do anything
}
};
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java Thu Jun 13 15:54:38 2013
@@ -440,11 +440,11 @@ public class TestClientRMTokens {
}
@Override
- public void stop() {
+ protected void serviceStop() throws Exception {
if (rmDTSecretManager != null) {
rmDTSecretManager.stopThreads();
}
- super.stop();
+ super.serviceStop();
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java Thu Jun 13 15:54:38 2013
@@ -192,43 +192,43 @@ public class TestResourceManager {
public void testResourceManagerInitConfigValidation() throws Exception {
Configuration conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS, -1);
+ resourceManager = new ResourceManager();
try {
resourceManager.init(conf);
fail("Exception is expected because the global max attempts" +
" is negative.");
} catch (YarnRuntimeException e) {
// Exception is expected.
- assertTrue("The thrown exception is not the expected one.",
- e.getMessage().startsWith(
- "Invalid global max attempts configuration"));
+ if (!e.getMessage().startsWith(
+ "Invalid global max attempts configuration")) throw e;
}
conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 2048);
conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, 1024);
+ resourceManager = new ResourceManager();
try {
resourceManager.init(conf);
fail("Exception is expected because the min memory allocation is" +
" larger than the max memory allocation.");
} catch (YarnRuntimeException e) {
// Exception is expected.
- assertTrue("The thrown exception is not the expected one.",
- e.getMessage().startsWith(
- "Invalid resource scheduler memory"));
+ if (!e.getMessage().startsWith(
+ "Invalid resource scheduler memory")) throw e;
}
conf = new YarnConfiguration();
conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_VCORES, 2);
conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_VCORES, 1);
+ resourceManager = new ResourceManager();
try {
resourceManager.init(conf);
fail("Exception is expected because the min vcores allocation is" +
" larger than the max vcores allocation.");
} catch (YarnRuntimeException e) {
// Exception is expected.
- assertTrue("The thrown exception is not the expected one.",
- e.getMessage().startsWith(
- "Invalid resource scheduler vcores"));
+ if (!e.getMessage().startsWith(
+ "Invalid resource scheduler vcores")) throw e;
}
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/resourcetracker/TestNMExpiry.java Thu Jun 13 15:54:38 2013
@@ -59,9 +59,9 @@ public class TestNMExpiry {
}
@Override
- public void init(Configuration conf) {
+ public void serviceInit(Configuration conf) throws Exception {
conf.setLong(YarnConfiguration.RM_NM_EXPIRY_INTERVAL_MS, 1000);
- super.init(conf);
+ super.serviceInit(conf);
}
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientTokens.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientTokens.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientTokens.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientTokens.java Thu Jun 13 15:54:38 2013
@@ -128,7 +128,7 @@ public class TestClientTokens {
}
@Override
- public synchronized void start() {
+ protected void serviceStart() throws Exception {
Configuration conf = getConfig();
ClientToAMTokenSecretManager secretManager = null;
@@ -145,7 +145,7 @@ public class TestClientTokens {
}
server.start();
this.address = NetUtils.getConnectAddress(server);
- super.start();
+ super.serviceStart();
}
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java Thu Jun 13 15:54:38 2013
@@ -92,7 +92,7 @@ public class MiniYARNCluster extends Com
new Path(targetWorkDir.getAbsolutePath()), true);
} catch (Exception e) {
LOG.warn("COULD NOT CLEANUP", e);
- throw new YarnRuntimeException("could not cleanup test dir", e);
+ throw new YarnRuntimeException("could not cleanup test dir: "+ e, e);
}
if (Shell.WINDOWS) {
@@ -140,9 +140,10 @@ public class MiniYARNCluster extends Com
}
@Override
- public void init(Configuration conf) {
- super.init(conf instanceof YarnConfiguration ? conf
- : new YarnConfiguration(conf));
+ public void serviceInit(Configuration conf) throws Exception {
+ super.serviceInit(conf instanceof YarnConfiguration ? conf
+ : new YarnConfiguration(
+ conf));
}
public File getTestWorkDir() {
@@ -172,23 +173,24 @@ public class MiniYARNCluster extends Com
}
@Override
- public synchronized void start() {
+ public synchronized void serviceStart() throws Exception {
try {
getConfig().setBoolean(YarnConfiguration.IS_MINI_YARN_CLUSTER, true);
if (!getConfig().getBoolean(
YarnConfiguration.YARN_MINICLUSTER_FIXED_PORTS,
YarnConfiguration.DEFAULT_YARN_MINICLUSTER_FIXED_PORTS)) {
// pick free random ports.
+ String hostname = MiniYARNCluster.getHostname();
getConfig().set(YarnConfiguration.RM_ADDRESS,
- MiniYARNCluster.getHostname() + ":0");
+ hostname + ":0");
getConfig().set(YarnConfiguration.RM_ADMIN_ADDRESS,
- MiniYARNCluster.getHostname() + ":0");
+ hostname + ":0");
getConfig().set(YarnConfiguration.RM_SCHEDULER_ADDRESS,
- MiniYARNCluster.getHostname() + ":0");
+ hostname + ":0");
getConfig().set(YarnConfiguration.RM_RESOURCE_TRACKER_ADDRESS,
- MiniYARNCluster.getHostname() + ":0");
+ hostname + ":0");
getConfig().set(YarnConfiguration.RM_WEBAPP_ADDRESS,
- MiniYARNCluster.getHostname() + ":0");
+ hostname + ":0");
}
resourceManager = new ResourceManager() {
@Override
@@ -214,7 +216,7 @@ public class MiniYARNCluster extends Com
"ResourceManager failed to start. Final state is "
+ resourceManager.getServiceState());
}
- super.start();
+ super.serviceStart();
} catch (Throwable t) {
throw new YarnRuntimeException(t);
}
@@ -225,11 +227,11 @@ public class MiniYARNCluster extends Com
}
@Override
- public synchronized void stop() {
+ public synchronized void serviceStop() throws Exception {
if (resourceManager != null) {
resourceManager.stop();
}
- super.stop();
+ super.serviceStop();
if (Shell.WINDOWS) {
// On Windows, clean up the short temporary symlink that was created to
@@ -254,10 +256,10 @@ public class MiniYARNCluster extends Com
index = i;
}
- public synchronized void init(Configuration conf) {
- Configuration config = new YarnConfiguration(conf);
- super.init(config);
- }
+ public synchronized void serviceInit(Configuration conf) throws Exception {
+ Configuration config = new YarnConfiguration(conf);
+ super.serviceInit(config);
+ }
/**
* Create local/log directories
@@ -279,7 +281,7 @@ public class MiniYARNCluster extends Com
return dirsString;
}
- public synchronized void start() {
+ public synchronized void serviceStart() throws Exception {
try {
// create nm-local-dirs and configure them for the nodemanager
String localDirsString = prepareDirs("local", numLocalDirs);
@@ -319,18 +321,18 @@ public class MiniYARNCluster extends Com
// RM could have failed.
throw new IOException("NodeManager " + index + " failed to start");
}
- super.start();
+ super.serviceStart();
} catch (Throwable t) {
throw new YarnRuntimeException(t);
}
}
@Override
- public synchronized void stop() {
+ public synchronized void serviceStop() throws Exception {
if (nodeManagers[index] != null) {
nodeManagers[index].stop();
}
- super.stop();
+ super.serviceStop();
}
}
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxy.java Thu Jun 13 15:54:38 2013
@@ -51,7 +51,7 @@ public class WebAppProxy extends Abstrac
}
@Override
- public void init(Configuration conf) {
+ protected void serviceInit(Configuration conf) throws Exception {
String auth = conf.get(CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION);
if (auth == null || "simple".equals(auth)) {
isSecurityEnabled = false;
@@ -81,11 +81,11 @@ public class WebAppProxy extends Abstrac
}
acl = new AccessControlList(conf.get(YarnConfiguration.YARN_ADMIN_ACL,
YarnConfiguration.DEFAULT_YARN_ADMIN_ACL));
- super.init(conf);
+ super.serviceInit(conf);
}
@Override
- public void start() {
+ protected void serviceStart() throws Exception {
try {
proxyServer = new HttpServer("proxy", bindAddress, port,
port == 0, getConfig(), acl);
@@ -99,11 +99,11 @@ public class WebAppProxy extends Abstrac
LOG.fatal("Could not start proxy web server",e);
throw new YarnRuntimeException("Could not start proxy web server",e);
}
- super.start();
+ super.serviceStart();
}
@Override
- public void stop() {
+ protected void serviceStop() throws Exception {
if(proxyServer != null) {
try {
proxyServer.stop();
@@ -112,7 +112,7 @@ public class WebAppProxy extends Abstrac
throw new YarnRuntimeException("Error stopping proxy web server",e);
}
}
- super.stop();
+ super.serviceStop();
}
public void join() {
Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java?rev=1492718&r1=1492717&r2=1492718&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java (original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java Thu Jun 13 15:54:38 2013
@@ -51,7 +51,7 @@ public class WebAppProxyServer extends C
}
@Override
- public synchronized void init(Configuration conf) {
+ protected void serviceInit(Configuration conf) throws Exception {
Configuration config = new YarnConfiguration(conf);
try {
doSecureLogin(conf);
@@ -60,7 +60,7 @@ public class WebAppProxyServer extends C
}
proxy = new WebAppProxy();
addService(proxy);
- super.init(config);
+ super.serviceInit(config);
}
/**