Modified: hadoop/common/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NMLivelinessMonitor.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMTokens.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java?rev=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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/branches/branch-2/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/branches/branch-2/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=1492720&r1=1492719&r2=1492720&view=diff ============================================================================== --- hadoop/common/branches/branch-2/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/branches/branch-2/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:56:44 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); } /**
