-
Notifications
You must be signed in to change notification settings - Fork 8.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HADOOP-18217. ExitUtil synchronized blocks reduced. #4255
Reduce the ExitUtil synchronized block scopes so System.exit and Runtime.halt calls aren't within their boundaries, so ExitUtil wrappers do not block each other. Enlarged catches to all Throwables (not just Exceptions). Contributed by Remi Catherinot
- Loading branch information
1 parent
f4e8a4f
commit e0abdd8
Showing
2 changed files
with
243 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestExitUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.hadoop.util; | ||
|
|
||
| import static org.apache.hadoop.test.LambdaTestUtils.intercept; | ||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertNull; | ||
| import static org.junit.Assert.assertSame; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import org.apache.hadoop.util.ExitUtil.ExitException; | ||
| import org.apache.hadoop.util.ExitUtil.HaltException; | ||
| import org.apache.hadoop.test.AbstractHadoopTestBase; | ||
|
|
||
| public class TestExitUtil extends AbstractHadoopTestBase { | ||
|
|
||
| @Before | ||
| public void before() { | ||
| ExitUtil.disableSystemExit(); | ||
| ExitUtil.disableSystemHalt(); | ||
| ExitUtil.resetFirstExitException(); | ||
| ExitUtil.resetFirstHaltException(); | ||
| } | ||
|
|
||
| @After | ||
| public void after() { | ||
| ExitUtil.resetFirstExitException(); | ||
| ExitUtil.resetFirstHaltException(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetSetExitExceptions() throws Throwable { | ||
| // prepare states and exceptions | ||
| ExitException ee1 = new ExitException(1, "TestExitUtil forged 1st ExitException"); | ||
| ExitException ee2 = new ExitException(2, "TestExitUtil forged 2nd ExitException"); | ||
| // check proper initial settings | ||
| assertFalse("ExitUtil.terminateCalled initial value should be false", | ||
| ExitUtil.terminateCalled()); | ||
| assertNull("ExitUtil.getFirstExitException initial value should be null", | ||
| ExitUtil.getFirstExitException()); | ||
|
|
||
| // simulate/check 1st call | ||
| ExitException ee = intercept(ExitException.class, ()->ExitUtil.terminate(ee1)); | ||
| assertSame("ExitUtil.terminate should have rethrown its ExitException argument but it " | ||
| + "had thrown something else", ee1, ee); | ||
| assertTrue("ExitUtil.terminateCalled should be true after 1st ExitUtil.terminate call", | ||
| ExitUtil.terminateCalled()); | ||
| assertSame("ExitUtil.terminate should store its 1st call's ExitException", | ||
| ee1, ExitUtil.getFirstExitException()); | ||
|
|
||
| // simulate/check 2nd call not overwritting 1st one | ||
| ee = intercept(ExitException.class, ()->ExitUtil.terminate(ee2)); | ||
| assertSame("ExitUtil.terminate should have rethrown its HaltException argument but it " | ||
| + "had thrown something else", ee2, ee); | ||
| assertTrue("ExitUtil.terminateCalled should still be true after 2nd ExitUtil.terminate call", | ||
| ExitUtil.terminateCalled()); | ||
| // 2nd call rethrown the 2nd ExitException yet only the 1st only should have been stored | ||
| assertSame("ExitUtil.terminate when called twice should only remember 1st call's " | ||
| + "ExitException", ee1, ExitUtil.getFirstExitException()); | ||
|
|
||
| // simulate cleanup, also tries to make sure state is ok for all junit still has to do | ||
| ExitUtil.resetFirstExitException(); | ||
| assertFalse("ExitUtil.terminateCalled should be false after " | ||
| + "ExitUtil.resetFirstExitException call", ExitUtil.terminateCalled()); | ||
| assertNull("ExitUtil.getFirstExitException should be null after " | ||
| + "ExitUtil.resetFirstExitException call", ExitUtil.getFirstExitException()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testGetSetHaltExceptions() throws Throwable { | ||
| // prepare states and exceptions | ||
| ExitUtil.disableSystemHalt(); | ||
| ExitUtil.resetFirstHaltException(); | ||
| HaltException he1 = new HaltException(1, "TestExitUtil forged 1st HaltException"); | ||
| HaltException he2 = new HaltException(2, "TestExitUtil forged 2nd HaltException"); | ||
|
|
||
| // check proper initial settings | ||
| assertFalse("ExitUtil.haltCalled initial value should be false", | ||
| ExitUtil.haltCalled()); | ||
| assertNull("ExitUtil.getFirstHaltException initial value should be null", | ||
| ExitUtil.getFirstHaltException()); | ||
|
|
||
| // simulate/check 1st call | ||
| HaltException he = intercept(HaltException.class, ()->ExitUtil.halt(he1)); | ||
| assertSame("ExitUtil.halt should have rethrown its HaltException argument but it had " | ||
| +"thrown something else", he1, he); | ||
| assertTrue("ExitUtil.haltCalled should be true after 1st ExitUtil.halt call", | ||
| ExitUtil.haltCalled()); | ||
| assertSame("ExitUtil.halt should store its 1st call's HaltException", | ||
| he1, ExitUtil.getFirstHaltException()); | ||
|
|
||
| // simulate/check 2nd call not overwritting 1st one | ||
| he = intercept(HaltException.class, ()->ExitUtil.halt(he2)); | ||
| assertSame("ExitUtil.halt should have rethrown its HaltException argument but it had " | ||
| +"thrown something else", he2, he); | ||
| assertTrue("ExitUtil.haltCalled should still be true after 2nd ExitUtil.halt call", | ||
| ExitUtil.haltCalled()); | ||
| assertSame("ExitUtil.halt when called twice should only remember 1st call's HaltException", | ||
| he1, ExitUtil.getFirstHaltException()); | ||
|
|
||
| // simulate cleanup, also tries to make sure state is ok for all junit still has to do | ||
| ExitUtil.resetFirstHaltException(); | ||
| assertFalse("ExitUtil.haltCalled should be false after " | ||
| + "ExitUtil.resetFirstHaltException call", ExitUtil.haltCalled()); | ||
| assertNull("ExitUtil.getFirstHaltException should be null after " | ||
| + "ExitUtil.resetFirstHaltException call", ExitUtil.getFirstHaltException()); | ||
| } | ||
| } |