This reverts commit ff75aa52f3
.
This commit is contained in:
parent
ff75aa52f3
commit
81faae6343
@ -140,7 +140,9 @@ public int run(String[] argv) {
|
||||
|
||||
try {
|
||||
context = new DistCpContext(OptionsParser.parse(argv));
|
||||
LOG.info("Input Options: {}", context);
|
||||
checkSplitLargeFile();
|
||||
setTargetPathExists();
|
||||
LOG.info("Input Options: " + context);
|
||||
} catch (Throwable e) {
|
||||
LOG.error("Invalid arguments: ", e);
|
||||
System.err.println("Invalid arguments: " + e.getMessage());
|
||||
@ -150,7 +152,7 @@ public int run(String[] argv) {
|
||||
|
||||
Job job = null;
|
||||
try {
|
||||
job = execute(true);
|
||||
job = execute();
|
||||
} catch (InvalidInputException e) {
|
||||
LOG.error("Invalid input: ", e);
|
||||
return DistCpConstants.INVALID_ARGUMENT;
|
||||
@ -167,7 +169,7 @@ public int run(String[] argv) {
|
||||
LOG.error("Exception encountered ", e);
|
||||
return DistCpConstants.UNKNOWN_ERROR;
|
||||
} finally {
|
||||
// Blocking distcp so close the job after it's done
|
||||
//Blocking distcp so close the job after its done
|
||||
if (job != null && context.shouldBlock()) {
|
||||
try {
|
||||
job.close();
|
||||
@ -179,31 +181,15 @@ public int run(String[] argv) {
|
||||
return DistCpConstants.SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Original entrypoint of a distcp job. Calls {@link DistCp#execute(boolean)}
|
||||
* without doing extra context checks and setting some configs.
|
||||
* @return Job handle
|
||||
* @throws Exception when fails to submit distcp job or distcp job fails
|
||||
*/
|
||||
public Job execute() throws Exception {
|
||||
return execute(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements the core-execution. Creates the file-list for copy,
|
||||
* and launches the Hadoop-job, to do the copy.
|
||||
* @param extraContextChecks if true, does extra context checks and sets some configs.
|
||||
* @return Job handle
|
||||
* @throws Exception when fails to submit distcp job or distcp job fails, or context checks fail
|
||||
* @throws Exception
|
||||
*/
|
||||
public Job execute(boolean extraContextChecks) throws Exception {
|
||||
public Job execute() throws Exception {
|
||||
Preconditions.checkState(context != null,
|
||||
"The DistCpContext should have been created before running DistCp!");
|
||||
if (extraContextChecks) {
|
||||
checkSplitLargeFile();
|
||||
setTargetPathExists();
|
||||
}
|
||||
|
||||
Job job = createAndSubmitJob();
|
||||
|
||||
if (context.shouldBlock()) {
|
||||
|
@ -156,10 +156,7 @@ public void testCleanupOfJob() throws Exception {
|
||||
DistCp distcp = mock(DistCp.class);
|
||||
Job job = spy(Job.class);
|
||||
Mockito.when(distcp.getConf()).thenReturn(conf);
|
||||
Mockito.when(distcp.createAndSubmitJob()).thenReturn(job);
|
||||
Mockito.when(distcp.execute()).thenCallRealMethod();
|
||||
Mockito.when(distcp.execute(Mockito.anyBoolean())).thenCallRealMethod();
|
||||
Mockito.doReturn(true).when(job).waitForCompletion(Mockito.anyBoolean());
|
||||
Mockito.when(distcp.execute()).thenReturn(job);
|
||||
Mockito.when(distcp.run(Mockito.any())).thenCallRealMethod();
|
||||
String[] arg = { soure.toString(), target.toString() };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user