Repository: oozie Updated Branches: refs/heads/master 04de377fb -> ae6a4395d
OOZIE-3001 Core has many Javadoc warnings (lines with trailing spaces and longer than 132 chars) (dbist13 via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/ae6a4395 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/ae6a4395 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/ae6a4395 Branch: refs/heads/master Commit: ae6a4395d1512ca592ce2df2845c7318c18d37a6 Parents: 04de377 Author: Andras Piros <[email protected]> Authored: Thu Nov 9 08:36:08 2017 +0100 Committer: Andras Piros <[email protected]> Committed: Thu Nov 9 08:36:08 2017 +0100 ---------------------------------------------------------------------- .../oozie/action/email/EmailActionExecutor.java | 12 ++++++--- .../oozie/action/hadoop/HCatCredentials.java | 8 +++--- .../oozie/action/hadoop/HbaseCredentials.java | 6 +++-- .../oozie/action/hadoop/JavaActionExecutor.java | 3 ++- .../command/bundle/BundleJobException.java | 4 +-- .../command/bundle/BundleJobResumeXCommand.java | 26 +++++++++++++------- .../command/bundle/BundleKillXCommand.java | 15 ++++++++--- release-log.txt | 1 + 8 files changed, 50 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java b/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java index d941753..d59f1d7 100644 --- a/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/email/EmailActionExecutor.java @@ -216,9 +216,11 @@ public class EmailActionExecutor extends ActionExecutor { from = new InternetAddress(fromAddr); message.setFrom(from); } catch (AddressException e) { - throw new ActionExecutorException(ErrorType.ERROR, "EM002", "Bad from address specified in ${oozie.email.from.address}.", e); + throw new ActionExecutorException(ErrorType.ERROR, "EM002", + "Bad from address specified in ${oozie.email.from.address}.", e); } catch (MessagingException e) { - throw new ActionExecutorException(ErrorType.ERROR, "EM003", "Error setting a from address in the message.", e); + throw new ActionExecutorException(ErrorType.ERROR, "EM003", + "Error setting a from address in the message.", e); } try { @@ -292,9 +294,11 @@ public class EmailActionExecutor extends ActionExecutor { // (Session+Message has adequate details.) Transport.send(message); } catch (NoSuchProviderException e) { - throw new ActionExecutorException(ErrorType.ERROR, "EM006", "Could not find an SMTP transport provider to email.", e); + throw new ActionExecutorException(ErrorType.ERROR, "EM006", + "Could not find an SMTP transport provider to email.", e); } catch (MessagingException e) { - throw new ActionExecutorException(ErrorType.ERROR, "EM007", "Encountered an error while sending the email message over SMTP.", e); + throw new ActionExecutorException(ErrorType.ERROR, "EM007", + "Encountered an error while sending the email message over SMTP.", e); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentials.java b/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentials.java index 47b2407..9260d83 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentials.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentials.java @@ -32,7 +32,8 @@ import org.apache.oozie.util.XLog; * Credentials implementation to store in jobConf, HCat-specific properties such as Principal and Uri * User specifies these credential properties along with the action configuration * The jobConf is used further to pass credentials to the tasks while running - * Oozie server should be configured to use this Credentials class by including it via property 'oozie.credentials.credentialclasses' + * Oozie server should be configured to use this Credentials class by including it via property + * 'oozie.credentials.credentialclasses' * User can extend the parent class to implement own class as well * for handling custom token-based credentials and add to the above server property */ @@ -48,7 +49,8 @@ public class HCatCredentials implements CredentialsProvider { } /* (non-Javadoc) - * @see org.apache.oozie.action.hadoop.Credentials#addtoJobConf(org.apache.hadoop.mapred.JobConf, org.apache.oozie.action.hadoop.CredentialsProperties, org.apache.oozie.action.ActionExecutor.Context) + * @see org.apache.oozie.action.hadoop.Credentials#addtoJobConf(org.apache.hadoop.mapred.JobConf, + * org.apache.oozie.action.hadoop.CredentialsProperties, org.apache.oozie.action.ActionExecutor.Context) */ @Override public void updateCredentials(Credentials credentials, Configuration config, CredentialsProperties props, @@ -102,4 +104,4 @@ public class HCatCredentials implements CredentialsProvider { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java index bc87f29..4d63c04 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java @@ -39,12 +39,14 @@ import org.apache.oozie.util.XLog; /** * Hbase Credentials implementation to store in jobConf * The jobConf is used further to pass credentials to the tasks while running - * Oozie server should be configured to use this Credentials class by including it via property 'oozie.credentials.credentialclasses' + * Oozie server should be configured to use this Credentials class by including it via property + * 'oozie.credentials.credentialclasses' * */ public class HbaseCredentials implements CredentialsProvider { /* (non-Javadoc) - * @see org.apache.oozie.action.hadoop.Credentials#addtoJobConf(org.apache.hadoop.mapred.JobConf, org.apache.oozie.action.hadoop.CredentialsProperties, org.apache.oozie.action.ActionExecutor.Context) + * @see org.apache.oozie.action.hadoop.Credentials#addtoJobConf(org.apache.hadoop.mapred.JobConf, + * org.apache.oozie.action.hadoop.CredentialsProperties, org.apache.oozie.action.ActionExecutor.Context) */ @Override public void updateCredentials(Credentials credentials, Configuration config, CredentialsProperties props, http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index b49ee78..8cb76cf 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -678,7 +678,8 @@ public class JavaActionExecutor extends ActionExecutor { { Path actionLibsPath = new Path(actionLibsStr); String user = conf.get("user.name"); - FileSystem fs = Services.get().get(HadoopAccessorService.class).createFileSystem(user, appPath.toUri(), conf); + FileSystem fs = Services.get().get(HadoopAccessorService.class).createFileSystem(user, + appPath.toUri(), conf); if (fs.exists(actionLibsPath)) { FileStatus[] files = fs.listStatus(actionLibsPath); for (FileStatus file : files) { http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/core/src/main/java/org/apache/oozie/command/bundle/BundleJobException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleJobException.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleJobException.java index 05e526e..d112fb4 100644 --- a/core/src/main/java/org/apache/oozie/command/bundle/BundleJobException.java +++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleJobException.java @@ -28,7 +28,7 @@ public class BundleJobException extends XException { /** * Create an Bundle Job exception from a XException. - * + * * @param cause the XException cause. */ public BundleJobException(XException cause) { @@ -37,7 +37,7 @@ public class BundleJobException extends XException { /** * Create a Bundle Job exception. - * + * * @param errorCode error code. * @param params parameters for the error code message template. */ http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java index 2e3671d..e2bd69f 100644 --- a/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleJobResumeXCommand.java @@ -65,19 +65,23 @@ public class BundleJobResumeXCommand extends ResumeTransitionXCommand { @Override public void resumeChildren() { for (BundleActionBean action : bundleActions) { - if (action.getStatus() == Job.Status.SUSPENDED || action.getStatus() == Job.Status.SUSPENDEDWITHERROR || action.getStatus() == Job.Status.PREPSUSPENDED) { + if (action.getStatus() == Job.Status.SUSPENDED + || action.getStatus() == Job.Status.SUSPENDEDWITHERROR + || action.getStatus() == Job.Status.PREPSUSPENDED) { // queue a CoordResumeXCommand if (action.getCoordId() != null) { queue(new CoordResumeXCommand(action.getCoordId())); updateBundleAction(action); - LOG.debug("Resume bundle action = [{0}], new status = [{1}], pending = [{2}] and queue CoordResumeXCommand for [{3}]", - action.getBundleActionId(), action.getStatus(), action.getPending(), action + LOG.debug("Resume bundle action = [{0}], new status = [{1}], " + + "pending = [{2}] and queue CoordResumeXCommand for [{3}]", + action.getBundleActionId(), action.getStatus(), action.getPending(), action .getCoordId()); } else { updateBundleAction(action); - LOG.debug("Resume bundle action = [{0}], new status = [{1}], pending = [{2}] and coord id is null", - action.getBundleActionId(), action.getStatus(), action.getPending()); + LOG.debug("Resume bundle action = [{0}], new status = [{1}], " + + "pending = [{2}] and coord id is null", + action.getBundleActionId(), action.getStatus(), action.getPending()); } } } @@ -96,7 +100,8 @@ public class BundleJobResumeXCommand extends ResumeTransitionXCommand { } action.incrementAndGetPending(); action.setLastModifiedTime(new Date()); - updateList.add(new UpdateEntry<BundleActionQuery>(BundleActionQuery.UPDATE_BUNDLE_ACTION_STATUS_PENDING_MODTIME, action)); + updateList.add(new UpdateEntry<BundleActionQuery>( + BundleActionQuery.UPDATE_BUNDLE_ACTION_STATUS_PENDING_MODTIME, action)); } /* (non-Javadoc) @@ -115,8 +120,10 @@ public class BundleJobResumeXCommand extends ResumeTransitionXCommand { InstrumentUtils.incrJobCounter("bundle_resume", 1, null); bundleJob.setSuspendedTime(null); bundleJob.setLastModifiedTime(new Date()); - LOG.debug("Resume bundle job id = " + bundleId + ", status = " + bundleJob.getStatus() + ", pending = " + bundleJob.isPending()); - updateList.add(new UpdateEntry<BundleJobQuery>(BundleJobQuery.UPDATE_BUNDLE_JOB_STATUS_PENDING_SUSP_MOD_TIME, bundleJob)); + LOG.debug("Resume bundle job id = " + bundleId + ", " + + "status = " + bundleJob.getStatus() + ", pending = " + bundleJob.isPending()); + updateList.add(new UpdateEntry<BundleJobQuery>( + BundleJobQuery.UPDATE_BUNDLE_JOB_STATUS_PENDING_SUSP_MOD_TIME, bundleJob)); } /* (non-Javadoc) @@ -175,7 +182,8 @@ public class BundleJobResumeXCommand extends ResumeTransitionXCommand { */ @Override protected void verifyPrecondition() throws CommandException, PreconditionException { - if (bundleJob.getStatus() != Job.Status.SUSPENDED && bundleJob.getStatus() != Job.Status.SUSPENDEDWITHERROR && bundleJob.getStatus() != Job.Status.PREPSUSPENDED) { + if (bundleJob.getStatus() != Job.Status.SUSPENDED && bundleJob.getStatus() != Job.Status.SUSPENDEDWITHERROR + && bundleJob.getStatus() != Job.Status.PREPSUSPENDED) { throw new PreconditionException(ErrorCode.E1100, "BundleResumeCommand not Resumed - " + "job not in SUSPENDED/SUSPENDEDWITHERROR/PREPSUSPENDED state " + bundleId); } http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java index 1516ec3..4e71791 100644 --- a/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleKillXCommand.java @@ -102,12 +102,19 @@ public class BundleKillXCommand extends KillTransitionXCommand { if (action.getCoordId() != null) { queue(new CoordKillXCommand(action.getCoordId())); updateBundleAction(action); - LOG.debug("Killed bundle action = [{0}], new status = [{1}], pending = [{2}] and queue CoordKillXCommand for [{3}]", - action.getBundleActionId(), action.getStatus(), action.getPending(), action.getCoordId()); + LOG.debug("Killed bundle action = [{0}], new status = [{1}], " + + "pending = [{2}] and queue CoordKillXCommand for [{3}]", + action.getBundleActionId(), + action.getStatus(), + action.getPending(), + action.getCoordId()); } else { updateBundleAction(action); - LOG.debug("Killed bundle action = [{0}], current status = [{1}], pending = [{2}]", action.getBundleActionId(), action - .getStatus(), action.getPending()); + LOG.debug("Killed bundle action = [{0}], current status = [{1}]," + + "pending = [{2}]", + action.getBundleActionId(), + action.getStatus(), + action.getPending()); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/ae6a4395/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 1edad13..b4e6199 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3001 Core has many Javadoc warnings (lines with trailing spaces and longer than 132 chars) (dbist13 via andras.piros) OOZIE-2996 Add options for GC overhead limit error to maven.test.java.opts (dbist13 via andras.piros) OOZIE-2897 LauncherAM should support ACLs (pbacsko) OOZIE-2962 bump maven-javadoc-plugin to 2.10.4 (dbist13 via andras.piros)
