diff --git hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java index ca667e2..51cb4a3 100644 --- hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java +++ hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/service/CompositeService.java @@ -141,8 +141,7 @@ protected void serviceStop() throws Exception { * @throws RuntimeException the first exception raised during the * stop process -after all services are stopped */ - private synchronized void stop(int numOfServicesStarted, - boolean stopOnlyStartedServices) { + private void stop(int numOfServicesStarted, boolean stopOnlyStartedServices) { // stop in reverse order of start Exception firstException = null; List services = getServices(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java index c5b2651..eaed7e1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java @@ -101,7 +101,7 @@ public AdminService(ResourceManager rm, RMContext rmContext) { } @Override - public synchronized void serviceInit(Configuration conf) throws Exception { + public void serviceInit(Configuration conf) throws Exception { if (rmContext.isHAEnabled()) { autoFailoverEnabled = HAUtil.isAutomaticFailoverEnabled(conf); if (autoFailoverEnabled) { @@ -123,18 +123,18 @@ public synchronized void serviceInit(Configuration conf) throws Exception { } @Override - protected synchronized void serviceStart() throws Exception { + protected void serviceStart() throws Exception { startServer(); super.serviceStart(); } @Override - protected synchronized void serviceStop() throws Exception { + protected void serviceStop() throws Exception { stopServer(); super.serviceStop(); } - protected void startServer() throws Exception { + protected synchronized void startServer() throws Exception { Configuration conf = getConfig(); YarnRPC rpc = YarnRPC.create(conf); this.server = (Server) rpc.getServer( @@ -171,7 +171,7 @@ protected void startServer() throws Exception { server.getListenerAddress()); } - protected void stopServer() throws Exception { + protected synchronized void stopServer() throws Exception { if (this.server != null) { this.server.stop(); } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/EmbeddedElectorService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/EmbeddedElectorService.java index 9f18ffb..5b45d07 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/EmbeddedElectorService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/EmbeddedElectorService.java @@ -60,7 +60,7 @@ } @Override - protected synchronized void serviceInit(Configuration conf) + protected void serviceInit(Configuration conf) throws Exception { conf = conf instanceof YarnConfiguration ? conf : new YarnConfiguration(conf); @@ -98,20 +98,20 @@ protected synchronized void serviceInit(Configuration conf) } @Override - protected synchronized void serviceStart() throws Exception { + protected void serviceStart() throws Exception { elector.joinElection(localActiveNodeInfo); super.serviceStart(); } @Override - protected synchronized void serviceStop() throws Exception { + protected void serviceStop() throws Exception { elector.quitElection(false); elector.terminateConnection(); super.serviceStop(); } @Override - public synchronized void becomeActive() throws ServiceFailedException { + public void becomeActive() throws ServiceFailedException { try { rmContext.getRMAdminService().transitionToActive(req); } catch (Exception e) { @@ -120,7 +120,7 @@ public synchronized void becomeActive() throws ServiceFailedException { } @Override - public synchronized void becomeStandby() { + public void becomeStandby() { try { rmContext.getRMAdminService().transitionToStandby(req); } catch (Exception e) { @@ -139,13 +139,13 @@ public void enterNeutralMode() { @SuppressWarnings(value = "unchecked") @Override - public synchronized void notifyFatalError(String errorMessage) { + public void notifyFatalError(String errorMessage) { rmContext.getDispatcher().getEventHandler().handle( new RMFatalEvent(RMFatalEventType.EMBEDDED_ELECTOR_FAILED, errorMessage)); } @Override - public synchronized void fenceOldActive(byte[] oldActiveData) { + public void fenceOldActive(byte[] oldActiveData) { if (LOG.isDebugEnabled()) { LOG.debug("Request to fence old active being ignored, " + "as embedded leader election doesn't support fencing"); @@ -162,7 +162,7 @@ public synchronized void fenceOldActive(byte[] oldActiveData) { .toByteArray(); } - private synchronized boolean isParentZnodeSafe(String clusterId) + private boolean isParentZnodeSafe(String clusterId) throws InterruptedException, IOException, KeeperException { byte[] data; try {