http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/store/WorkflowStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/store/WorkflowStore.java b/core/src/main/java/org/apache/oozie/store/WorkflowStore.java index 821abc5..573bcdd 100644 --- a/core/src/main/java/org/apache/oozie/store/WorkflowStore.java +++ b/core/src/main/java/org/apache/oozie/store/WorkflowStore.java @@ -319,12 +319,15 @@ public class WorkflowStore extends Store { ParamChecker.notEmpty(wfId, "WorkflowID"); List<WorkflowActionBean> actions = doOperation("getActionsForWorkflow", new Callable<List<WorkflowActionBean>>() { - public List<WorkflowActionBean> call() throws SQLException, StoreException, WorkflowException, + public List<WorkflowActionBean> call() throws SQLException, + StoreException, WorkflowException, InterruptedException { List<WorkflowActionBean> actions; - List<WorkflowActionBean> actionList = new ArrayList<WorkflowActionBean>(); + List<WorkflowActionBean> actionList + = new ArrayList<WorkflowActionBean>(); try { - Query q = entityManager.createNamedQuery("GET_ACTIONS_FOR_WORKFLOW"); + Query q = entityManager.createNamedQuery( + "GET_ACTIONS_FOR_WORKFLOW"); /* * OpenJPAQuery oq = OpenJPAPersistence.cast(q); @@ -368,12 +371,15 @@ public class WorkflowStore extends Store { ParamChecker.notEmpty(wfId, "WorkflowID"); List<WorkflowActionBean> actions = doOperation("getActionsForWorkflow", new Callable<List<WorkflowActionBean>>() { - public List<WorkflowActionBean> call() throws SQLException, StoreException, WorkflowException, + public List<WorkflowActionBean> call() throws SQLException, + StoreException, WorkflowException, InterruptedException { List<WorkflowActionBean> actions; - List<WorkflowActionBean> actionList = new ArrayList<WorkflowActionBean>(); + List<WorkflowActionBean> actionList + = new ArrayList<WorkflowActionBean>(); try { - Query q = entityManager.createNamedQuery("GET_ACTIONS_FOR_WORKFLOW"); + Query q = entityManager.createNamedQuery( + "GET_ACTIONS_FOR_WORKFLOW"); OpenJPAQuery oq = OpenJPAPersistence.cast(q); q.setParameter("wfId", wfId); q.setFirstResult(start - 1); @@ -792,7 +798,8 @@ public class WorkflowStore extends Store { actionDeleted += g.executeUpdate(); } } - XLog.getLog(getClass()).debug("ENDED Workflow Purge deleted jobs :" + workflows.size() + " and actions " + actionDeleted); + XLog.getLog(getClass()).debug("ENDED Workflow Purge deleted jobs :" + workflows.size() + " and actions " + + actionDeleted); return null; } });
http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/util/OozieRollingPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/OozieRollingPolicy.java b/core/src/main/java/org/apache/oozie/util/OozieRollingPolicy.java index 625053c..ceae9a8 100644 --- a/core/src/main/java/org/apache/oozie/util/OozieRollingPolicy.java +++ b/core/src/main/java/org/apache/oozie/util/OozieRollingPolicy.java @@ -47,11 +47,11 @@ public class OozieRollingPolicy extends RollingPolicyBase implements TriggeringP * Unfortunately, TimeBasedRollingPolicy is declared final, so we can't subclass it; instead, we have to wrap it */ private TimeBasedRollingPolicy tbrp; - + private Semaphore deleteSem; - + private Thread deleteThread; - + private int maxHistory = 720; // (720 hours / 24 hours per day = 30 days) as default String oozieLogDir; @@ -64,7 +64,7 @@ public class OozieRollingPolicy extends RollingPolicyBase implements TriggeringP public void setMaxHistory(int maxHistory) { this.maxHistory = maxHistory; } - + public OozieRollingPolicy() { deleteSem = new Semaphore(1); deleteThread = new Thread(); @@ -98,22 +98,23 @@ public class OozieRollingPolicy extends RollingPolicyBase implements TriggeringP tbrp.setFileNamePattern(getFileNamePattern()); tbrp.activateOptions(); } - + @Override public RolloverDescription initialize(String file, boolean append) throws SecurityException { return tbrp.initialize(file, append); } - + @Override public RolloverDescription rollover(final String activeFile) throws SecurityException { return tbrp.rollover(activeFile); } - + @Override - public boolean isTriggeringEvent(final Appender appender, final LoggingEvent event, final String filename, + public boolean isTriggeringEvent(final Appender appender, final LoggingEvent event, final String filename, final long fileLength) { if (maxHistory >= 0) { // -1 = disable - // Only delete old logs if we're not already deleting logs and another thread hasn't already started setting up to delete + // Only delete old logs if we're not already deleting logs and another thread hasn't already started setting + // up to delete // the old logs if (deleteSem.tryAcquire()) { if (!deleteThread.isAlive()) { @@ -131,7 +132,7 @@ public class OozieRollingPolicy extends RollingPolicyBase implements TriggeringP } return tbrp.isTriggeringEvent(appender, event, filename, fileLength); } - + private void deleteOldFiles() { ArrayList<FileInfo> fileList = new ArrayList<FileInfo>(); if (oozieLogDir != null && logFileName != null) { @@ -163,7 +164,7 @@ public class OozieRollingPolicy extends RollingPolicyBase implements TriggeringP } } } - + private long getGZFileCreationTime(String fileName) { SimpleDateFormat formatter; String date = fileName.substring(logFileName.length(), fileName.length() - 3); //3 for .gz @@ -212,5 +213,5 @@ public class OozieRollingPolicy extends RollingPolicyBase implements TriggeringP } } } - + } http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java index f3f4630..ed323a8 100644 --- a/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java +++ b/core/src/main/java/org/apache/oozie/util/ParameterVerifier.java @@ -30,14 +30,14 @@ import org.apache.hadoop.conf.Configuration; /** * Utility class to parse and verify the <parameters> section in a workflow or coordinator job */ -public abstract class ParameterVerifier +public abstract class ParameterVerifier { private static final Pattern nsVersionPattern = Pattern.compile("uri:oozie:(workflow|coordinator|bundle):(\\d+.\\d+)"); - + private static final double workflowMinVersion = 0.4; private static final double coordinatorMinVersion = 0.4; private static final double bundleMinVersion = 0.2; - + /** * Verify the parameters section (if supported in the schema) * @@ -50,7 +50,7 @@ public abstract class ParameterVerifier if (rootElement == null) { return; } - + if (supportsParameters(rootElement.getNamespaceURI())) { Element params = rootElement.getChild("parameters", rootElement.getNamespace()); if (params != null) { @@ -88,15 +88,15 @@ public abstract class ParameterVerifier } } } - + static boolean supportsParameters(String namespaceURI) { boolean supports = false; Matcher m = nsVersionPattern.matcher(namespaceURI); if (m.matches() && m.groupCount() == 2) { String type = m.group(1); double ver = Double.parseDouble(m.group(2)); - supports = ((type.equals("workflow") && ver >= workflowMinVersion) || - (type.equals("coordinator") && ver >= coordinatorMinVersion) || + supports = ((type.equals("workflow") && ver >= workflowMinVersion) || + (type.equals("coordinator") && ver >= coordinatorMinVersion) || (type.equals("bundle") && ver >= bundleMinVersion)); } return supports; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java b/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java index ef9a591..d1eb1c7 100644 --- a/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java +++ b/core/src/main/java/org/apache/oozie/util/ParameterVerifierException.java @@ -26,7 +26,7 @@ import org.apache.hadoop.conf.Configuration; * Exception thrown by {@link ParameterVerifier}. */ public class ParameterVerifierException extends XException { - + /** * Create a ParameterHandler exception from a XException. * @@ -45,5 +45,5 @@ public class ParameterVerifierException extends XException { public ParameterVerifierException(ErrorCode errorCode, Object... params) { super(errorCode, params); } - + } http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java b/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java index 03279eb..0f73603 100644 --- a/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java +++ b/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java @@ -62,7 +62,8 @@ public class PollablePriorityDelayQueue<E> extends PriorityDelayQueue<E> { queues[i - 1].remove(e); } else { - debug("poll(): the iterator element [{0}], from P[{1}] is not eligible to poll", e.getElement().toString(), i); + debug("poll(): the iterator element [{0}], from P[{1}] is not eligible to poll", + e.getElement().toString(), i); e = null; } } http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/util/db/Schema.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/db/Schema.java b/core/src/main/java/org/apache/oozie/util/db/Schema.java index 1278be1..a56da52 100644 --- a/core/src/main/java/org/apache/oozie/util/db/Schema.java +++ b/core/src/main/java/org/apache/oozie/util/db/Schema.java @@ -119,7 +119,8 @@ public class Schema { retVal = (dbType.equals(DBType.HSQL) ? "VARCHAR" : (dbType.equals(DBType.ORACLE) ? "CLOB" : "TEXT")); } else { - retVal = (dbType.equals(DBType.ORACLE) ? "VARCHAR2(" + column.getLength() + ")" : "VARCHAR(" + column.getLength() + ")"); + retVal = (dbType.equals(DBType.ORACLE) ? "VARCHAR2(" + column.getLength() + ")" : "VARCHAR(" + + column.getLength() + ")"); } } else { @@ -136,7 +137,8 @@ public class Schema { } else { if (Blob.class.equals(column.getType())) { - retVal = (dbType.equals(DBType.MySQL) ? "MEDIUMBLOB" : (dbType.equals(DBType.ORACLE) ? "BLOB" : "LONGVARBINARY")); + retVal = (dbType.equals(DBType.MySQL) ? "MEDIUMBLOB" : (dbType.equals(DBType.ORACLE) + ? "BLOB" : "LONGVARBINARY")); } else { throw new RuntimeException("Column Type[" + column.getType() + "] not mapped to any DB Data Type !!"); http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java b/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java index 97c7134..1e4852d 100644 --- a/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java +++ b/core/src/main/java/org/apache/oozie/workflow/lite/ActionNodeDef.java @@ -25,7 +25,7 @@ import java.util.Arrays; /** * Node definition for workflow action. This node definition is serialized object and should provide - * readFields() and write() for read and write of fields in this class. + * readFields() and write() for read and write of fields in this class. * */ public class ActionNodeDef extends NodeDef { @@ -37,12 +37,12 @@ public class ActionNodeDef extends NodeDef { String onError) { super(name, ParamChecker.notNull(conf, "conf"), actionHandlerClass, Arrays.asList(onOk, onError)); } - + public ActionNodeDef(String name, String conf, Class<? extends ActionNodeHandler> actionHandlerClass, String onOk, String onError, String cred) { super(name, ParamChecker.notNull(conf, "conf"), actionHandlerClass, Arrays.asList(onOk, onError), cred); } - + public ActionNodeDef(String name, String conf, Class<? extends ActionNodeHandler> actionHandlerClass, String onOk, String onError, String cred, String userRetryMax, String userRetryInterval, String userRetryPolicy) { super(name, ParamChecker.notNull(conf, "conf"), actionHandlerClass, Arrays.asList(onOk, onError), cred, http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java b/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java index dd6afa0..22c14fc 100644 --- a/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java +++ b/core/src/main/java/org/apache/oozie/workflow/lite/DBLiteWorkflowLib.java @@ -98,7 +98,8 @@ public class DBLiteWorkflowLib extends LiteWorkflowLib { ParamChecker.notNull(instance, "instance"); try { SqlStatement.update(OozieTable.WF_PROCESS_INSTANCE).set(OozieColumn.PI_state, - WritableUtils.toByteArray((LiteWorkflowInstance) instance)).where( + WritableUtils + .toByteArray((LiteWorkflowInstance) instance)).where( SqlStatement.isEqual(OozieColumn.PI_wfId, instance.getId())). prepareAndSetValues(connection).executeUpdate(); } http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java index 78b0652..a767124 100644 --- a/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java +++ b/core/src/main/java/org/apache/oozie/workflow/lite/LiteWorkflowAppParser.java @@ -556,7 +556,8 @@ public class LiteWorkflowAppParser { Element launcherConfiguration = actionElement.getChild(LAUNCHER_E, actionNs); if (launcherConfiguration != null) { - LauncherConfigHandler launcherConfigHandler = new LauncherConfigHandler(actionConf, launcherConfiguration, actionNs); + LauncherConfigHandler launcherConfigHandler = new LauncherConfigHandler( + actionConf, launcherConfiguration, actionNs); launcherConfigHandler.processSettings(); } http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/main/resources/localoozie-log4j.properties ---------------------------------------------------------------------- diff --git a/core/src/main/resources/localoozie-log4j.properties b/core/src/main/resources/localoozie-log4j.properties index 906397f..89fa398 100644 --- a/core/src/main/resources/localoozie-log4j.properties +++ b/core/src/main/resources/localoozie-log4j.properties @@ -6,9 +6,9 @@ # 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. http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/hadoop/examples/SleepJob.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/hadoop/examples/SleepJob.java b/core/src/test/java/org/apache/hadoop/examples/SleepJob.java index 342f8b3..ddfd26f 100644 --- a/core/src/test/java/org/apache/hadoop/examples/SleepJob.java +++ b/core/src/test/java/org/apache/hadoop/examples/SleepJob.java @@ -37,13 +37,13 @@ import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; /** - * Dummy class for testing MR framefork. Sleeps for a defined period - * of time in mapper and reducer. Generates fake input for map / reduce - * jobs. Note that generated number of input pairs is in the order + * Dummy class for testing MR framefork. Sleeps for a defined period + * of time in mapper and reducer. Generates fake input for map / reduce + * jobs. Note that generated number of input pairs is in the order * of <code>numMappers * mapSleepTime / 100</code>, so the job uses * some disk space. */ -public class SleepJob extends Configured implements Tool, +public class SleepJob extends Configured implements Tool, Mapper<IntWritable, IntWritable, IntWritable, NullWritable>, Reducer<IntWritable, NullWritable, NullWritable, NullWritable>, Partitioner<IntWritable,NullWritable> { @@ -57,7 +57,7 @@ public class SleepJob extends Configured implements Tool, public int getPartition(IntWritable k, NullWritable v, int numPartitions) { return k.get() % numPartitions; } - + public static class EmptySplit implements InputSplit { public void write(DataOutput out) throws IOException { } public void readFields(DataInput in) throws IOException { } @@ -113,7 +113,7 @@ public class SleepJob extends Configured implements Tool, OutputCollector<IntWritable, NullWritable> output, Reporter reporter) throws IOException { - //it is expected that every map processes mapSleepCount number of records. + //it is expected that every map processes mapSleepCount number of records. try { reporter.setStatus("Sleeping... (" + (mapSleepDuration * (mapSleepCount - count)) + ") ms left"); @@ -139,7 +139,7 @@ public class SleepJob extends Configured implements Tool, reporter.setStatus("Sleeping... (" + (reduceSleepDuration * (reduceSleepCount - count)) + ") ms left"); Thread.sleep(reduceSleepDuration); - + } catch (InterruptedException ex) { throw (IOException)new IOException( @@ -172,14 +172,14 @@ public class SleepJob extends Configured implements Tool, public int run(int numMapper, int numReducer, long mapSleepTime, int mapSleepCount, long reduceSleepTime, int reduceSleepCount) throws IOException { - JobConf job = setupJobConf(numMapper, numReducer, mapSleepTime, + JobConf job = setupJobConf(numMapper, numReducer, mapSleepTime, mapSleepCount, reduceSleepTime, reduceSleepCount); JobClient.runJob(job); return 0; } - public JobConf setupJobConf(int numMapper, int numReducer, - long mapSleepTime, int mapSleepCount, + public JobConf setupJobConf(int numMapper, int numReducer, + long mapSleepTime, int mapSleepCount, long reduceSleepTime, int reduceSleepCount) { JobConf job = new JobConf(getConf(), SleepJob.class); job.setNumMapTasks(numMapper); @@ -232,11 +232,11 @@ public class SleepJob extends Configured implements Tool, recSleepTime = Long.parseLong(args[++i]); } } - + // sleep for *SleepTime duration in Task by recSleepTime per record mapSleepCount = (int)Math.ceil(mapSleepTime / ((double)recSleepTime)); reduceSleepCount = (int)Math.ceil(reduceSleepTime / ((double)recSleepTime)); - + return run(numMapper, numReducer, mapSleepTime, mapSleepCount, reduceSleepTime, reduceSleepCount); } http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java b/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java index c6c9c49..5070f95 100644 --- a/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java +++ b/core/src/test/java/org/apache/oozie/TestCoordinatorEngine.java @@ -70,7 +70,8 @@ public class TestCoordinatorEngine extends XTestCase { Configuration conf = new XConfiguration(); String appPath = getTestCaseFileUri("coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-01T02:00Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=" + + "\"2009-02-01T02:00Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.1\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"local_a\" frequency=\"${coord:days(1)}\" initial-instance=\"2009-02-01T01:00Z\" " @@ -125,7 +126,8 @@ public class TestCoordinatorEngine extends XTestCase { public void testCustomDoneFlag() throws Exception { Configuration conf = new XConfiguration(); String appPath = getTestCaseFileUri("coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-01T02:00Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=" + + "\"2009-02-01T02:00Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.1\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"local_a\" frequency=\"${coord:days(1)}\" initial-instance=\"2009-02-01T01:00Z\" " @@ -179,7 +181,8 @@ public class TestCoordinatorEngine extends XTestCase { public void testEmptyDoneFlag() throws Exception { Configuration conf = new XConfiguration(); String appPath = getTestCaseFileUri("coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-01T02:00Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=" + + "\"2009-02-01T02:00Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.1\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"local_a\" frequency=\"${coord:days(1)}\" initial-instance=\"2009-02-01T01:00Z\" " @@ -233,7 +236,8 @@ public class TestCoordinatorEngine extends XTestCase { public void testDoneFlagCreation() throws Exception { Configuration conf = new XConfiguration(); String appPath = getTestCaseFileUri("coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-01T02:00Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=" + + "\"2009-02-01T02:00Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.1\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"local_a\" frequency=\"${coord:days(1)}\" initial-instance=\"2009-02-01T01:00Z\" " @@ -288,7 +292,8 @@ public class TestCoordinatorEngine extends XTestCase { private String _testSubmitJob(String appPath) throws Exception { Configuration conf = new XConfiguration(); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:minutes(20)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:minutes(20)}\" start=\"2009-02-01T01:00Z\" end=" + + "\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.1\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:minutes(20)}\" initial-instance=\"2009-02-01T01:00Z\" " @@ -299,7 +304,8 @@ public class TestCoordinatorEngine extends XTestCase { + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:" + + "///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/TestLocalOozieClientCoord.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/TestLocalOozieClientCoord.java b/core/src/test/java/org/apache/oozie/TestLocalOozieClientCoord.java index 177bff7..d1a1763 100644 --- a/core/src/test/java/org/apache/oozie/TestLocalOozieClientCoord.java +++ b/core/src/test/java/org/apache/oozie/TestLocalOozieClientCoord.java @@ -167,9 +167,11 @@ public class TestLocalOozieClientCoord extends XDataTestCase { + "xmlns=\"uri:oozie:coordinator:0.1\"> <controls> <timeout>10</timeout> <concurrency>1</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:minutes(20)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + + "</uri-template> </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:minutes(20)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + + "</uri-template> </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java b/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java index 9558aa5..42ce6ad 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java @@ -32,7 +32,8 @@ public class InsertTestToken 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 http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java index c6ec63c..907e3cd 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestHadoopELFunctions.java @@ -91,8 +91,10 @@ public class TestHadoopELFunctions extends ActionExecutorTestCase { + "\"NUMBER_JOBS\":\"2\"," + "\"RECORD_WRITTEN\":\"33\"," + "\"JOB_GRAPH\":\"job_201111300933_0004,job_201111300933_0005\"," - + "\"job_201111300933_0004\":{\"MAP_INPUT_RECORDS\":\"33\",\"MIN_REDUCE_TIME\":\"0\",\"MULTI_STORE_COUNTERS\":{},\"ERROR_MESSAGE\":null,\"JOB_ID\":\"job_201111300933_0004\"}," - + "\"job_201111300933_0005\":{\"MAP_INPUT_RECORDS\":\"37\",\"MIN_REDUCE_TIME\":\"0\",\"MULTI_STORE_COUNTERS\":{},\"ERROR_MESSAGE\":null,\"JOB_ID\":\"job_201111300933_0005\"}," + + "\"job_201111300933_0004\":{\"MAP_INPUT_RECORDS\":\"33\",\"MIN_REDUCE_TIME\":\"0\",\"MULTI_STORE_COUNTERS\":{}," + + "\"ERROR_MESSAGE\":null,\"JOB_ID\":\"job_201111300933_0004\"}," + + "\"job_201111300933_0005\":{\"MAP_INPUT_RECORDS\":\"37\",\"MIN_REDUCE_TIME\":\"0\",\"MULTI_STORE_COUNTERS\":{}," + + "\"ERROR_MESSAGE\":null,\"JOB_ID\":\"job_201111300933_0005\"}," + "\"BYTES_WRITTEN\":\"1410\"," + "\"HADOOP_VERSION\":\"0.20.2\"," + "\"RETURN_CODE\":\"0\"," + "\"ERROR_CODE\":\"-1\"," + "}"; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java index 2bd6a3f..e9ba8a8 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java @@ -2526,7 +2526,8 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase { "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>" + getNameNodeUri() + "</name-node>" + "<configuration>" + - " <property><name>oozie.launcher.env</name><value>LAUNCHER_ENVIRON=foo1" + File.pathSeparator + "B=foo2</value></property>" + + " <property><name>oozie.launcher.env</name><value>LAUNCHER_ENVIRON=foo1" + File.pathSeparator + + "B=foo2</value></property>" + "</configuration>" + "<main-class>" + LauncherMainTester.class.getName() + "</main-class>" + "</java>"; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java index 8d0b441..846a4e8 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java @@ -283,7 +283,8 @@ public class TestShellActionExecutor extends ActionExecutorTestCase { String actionXml = "<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>" + getNameNodeUri() + "</name-node>" + "<exec>" + SHELL_EXEC + "</exec>" + "<argument>" + SHELL_PARAM + "</argument>" + "<argument>" + SHELL_SCRIPTNAME + "</argument>" + "<argument>A</argument>" + "<argument>B</argument>" - + "<env-var>var1=val1</env-var>" + "<env-var>var2=" + envValueHavingEqualSign + "</env-var>" + "<file>" + script.toString() + + "<env-var>var1=val1</env-var>" + "<env-var>var2=" + envValueHavingEqualSign + "</env-var>" + "<file>" + + script.toString() + "#" + script.getName() + "</file>" + "<capture-output />" + "</shell>"; Context context = createContext(actionXml); http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobXCommand.java b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobXCommand.java index c6ecb5e..374c0b7 100644 --- a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleJobXCommand.java @@ -45,7 +45,7 @@ public class TestBundleJobXCommand extends XDataTestCase { /** * Test: submit bundle job, then check job info - * + * * @throws Exception */ public void testBundleJobInfo1() throws Exception { @@ -66,7 +66,7 @@ public class TestBundleJobXCommand extends XDataTestCase { /** * Test: jobId is wrong - * + * * @throws Exception */ public void testBundleJobInfoFailed() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/bundle/TestBundlePauseUnpauseXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/bundle/TestBundlePauseUnpauseXCommand.java b/core/src/test/java/org/apache/oozie/command/bundle/TestBundlePauseUnpauseXCommand.java index 46819d9..e860aea 100644 --- a/core/src/test/java/org/apache/oozie/command/bundle/TestBundlePauseUnpauseXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/bundle/TestBundlePauseUnpauseXCommand.java @@ -59,12 +59,12 @@ public class TestBundlePauseUnpauseXCommand extends XDataTestCase { job = jpaService.execute(bundleJobGetCmd); assertEquals(job.getStatus(), Job.Status.PREPPAUSED); - + new BundleUnpauseXCommand(job).call(); job = jpaService.execute(bundleJobGetCmd); assertEquals(job.getStatus(), Job.Status.PREP); } - + /** * Test : Pause a RUNNING bundle * @@ -83,7 +83,7 @@ public class TestBundlePauseUnpauseXCommand extends XDataTestCase { job = jpaService.execute(bundleJobGetCmd); assertEquals(job.getStatus(), Job.Status.PAUSED); - + new BundleUnpauseXCommand(job).call(); job = jpaService.execute(bundleJobGetCmd); assertEquals(job.getStatus(), Job.Status.RUNNING); @@ -107,7 +107,7 @@ public class TestBundlePauseUnpauseXCommand extends XDataTestCase { job = jpaService.execute(bundleJobGetCmd); assertEquals(job.getStatus(), Job.Status.PAUSEDWITHERROR); - + new BundleUnpauseXCommand(job).call(); job = jpaService.execute(bundleJobGetCmd); assertEquals(job.getStatus(), Job.Status.RUNNINGWITHERROR); http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/bundle/TestBundleRerunXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleRerunXCommand.java b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleRerunXCommand.java index 4a10a8b..599a22a 100644 --- a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleRerunXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleRerunXCommand.java @@ -291,7 +291,8 @@ public class TestBundleRerunXCommand extends XDataTestCase { } - protected BundleJobBean addRecordToBundleJobTableWithPausedTime(Job.Status jobStatus, boolean pending, Date pausedTime) throws Exception { + protected BundleJobBean addRecordToBundleJobTableWithPausedTime(Job.Status jobStatus, boolean pending, Date pausedTime) + throws Exception { BundleJobBean bundle = createBundleJob(jobStatus, pending); bundle.setPauseTime(pausedTime); try { @@ -308,7 +309,8 @@ public class TestBundleRerunXCommand extends XDataTestCase { return bundle; } - protected CoordinatorJobBean addRecordToCoordJobTable(String coordId, CoordinatorJob.Status status, boolean pending, boolean doneMatd) throws Exception { + protected CoordinatorJobBean addRecordToCoordJobTable( + String coordId, CoordinatorJob.Status status, boolean pending, boolean doneMatd) throws Exception { CoordinatorJobBean coordJob = createCoordJob(status, pending, doneMatd); coordJob.setId(coordId); coordJob.setAppName(coordId); http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java index 429eb0d..9c7a516 100644 --- a/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/bundle/TestBundleSubmitXCommand.java @@ -59,7 +59,7 @@ public class TestBundleSubmitXCommand extends XDataTestCase { /** * https://issues.apache.org/jira/browse/OOZIE-945 - * + * * @throws Exception */ public void testJobXmlCommentRemoved() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/CoordXTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/CoordXTestCase.java b/core/src/test/java/org/apache/oozie/command/coord/CoordXTestCase.java index 4a25356..3dca56f 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/CoordXTestCase.java +++ b/core/src/test/java/org/apache/oozie/command/coord/CoordXTestCase.java @@ -30,7 +30,7 @@ public abstract class CoordXTestCase extends XTestCase { super.setUp(); services = new Services(); services.init(); - + jpaService = Services.get().get(JPAService.class); if (jpaService == null) { fail("jpaService can not be null"); http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java index 99872dc..d1d2689 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java @@ -983,7 +983,8 @@ public class TestCoordActionInputCheckXCommand extends XDataTestCase { String confStr = jobConf.toXmlString(false); coordJob.setConf(confStr); - String appXml = "<coordinator-app xmlns='uri:oozie:coordinator:0.2' name='NAME' frequency=\"1\" start='2009-02-01T01:00" + TZ + "' end='2009-02-03T23:59" + TZ + "' timezone='UTC' freq_timeunit='DAY' end_of_duration='NONE'>"; + String appXml = "<coordinator-app xmlns='uri:oozie:coordinator:0.2' name='NAME' frequency=\"1\" start='2009-02-01T01:00" + + TZ + "' end='2009-02-03T23:59" + TZ + "' timezone='UTC' freq_timeunit='DAY' end_of_duration='NONE'>"; appXml += "<controls>"; appXml += "<timeout>10</timeout>"; appXml += "<concurrency>2</concurrency>"; @@ -991,7 +992,8 @@ public class TestCoordActionInputCheckXCommand extends XDataTestCase { appXml += "</controls>"; appXml += "<input-events>"; appXml += "<data-in name='A' dataset='a'>"; - appXml += "<dataset name='a' frequency='7' initial-instance='2009-01-01T01:00" + TZ + "' timezone='UTC' freq_timeunit='DAY' end_of_duration='NONE'>"; + appXml += "<dataset name='a' frequency='7' initial-instance='2009-01-01T01:00" + TZ + "' timezone='UTC'" + + " freq_timeunit='DAY' end_of_duration='NONE'>"; appXml += "<uri-template>" + getTestCaseFileUri("${YEAR}/${MONTH}/${DAY}" )+ "</uri-template>"; appXml += "</dataset>"; if (dataInType.equals("future")) { @@ -1010,7 +1012,8 @@ public class TestCoordActionInputCheckXCommand extends XDataTestCase { appXml += "</input-events>"; appXml += "<output-events>"; appXml += "<data-out name='LOCAL_A' dataset='local_a'>"; - appXml += "<dataset name='local_a' frequency='7' initial-instance='2009-01-01T01:00" + TZ + "' timezone='UTC' freq_timeunit='DAY' end_of_duration='NONE'>"; + appXml += "<dataset name='local_a' frequency='7' initial-instance='2009-01-01T01:00" + TZ + "' timezone='UTC'" + + " freq_timeunit='DAY' end_of_duration='NONE'>"; appXml += "<uri-template>" + getTestCaseFileUri("${YEAR}/${MONTH}/${DAY}" )+ "</uri-template>"; appXml += "</dataset>"; appXml += "<start-instance>${coord:current(-3)}</start-instance>"; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java index db66c72..261c496 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java @@ -229,7 +229,8 @@ public class TestCoordActionStartXCommand extends XDataTestCase { actionXml += "</controls>"; actionXml += "<input-events>"; actionXml += "<data-in name='A' dataset='a'>"; - actionXml += "<dataset name='a' frequency='7' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit='DAY' end_of_duration='NONE'>"; + actionXml += "<dataset name='a' frequency='7' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit='DAY'" + + " end_of_duration='NONE'>"; actionXml += "<uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>"; actionXml += "</dataset>"; actionXml += "<instance>${coord:latest(0)}</instance>"; @@ -237,7 +238,8 @@ public class TestCoordActionStartXCommand extends XDataTestCase { actionXml += "</input-events>"; actionXml += "<output-events>"; actionXml += "<data-out name='LOCAL_A' dataset='local_a'>"; - actionXml += "<dataset name='local_a' frequency='7' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit='DAY' end_of_duration='NONE'>"; + actionXml += "<dataset name='local_a' frequency='7' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit=" + + "'DAY' end_of_duration='NONE'>"; actionXml += "<uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>"; actionXml += "</dataset>"; actionXml += "<instance>${coord:current(-1)}</instance>"; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java index b8eb15d..b784093 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordChangeXCommand.java @@ -972,7 +972,8 @@ public class TestCoordChangeXCommand extends XDataTestCase { String confStr = "<configuration></configuration>"; coordJob.setConf(confStr); - String appXml = "<coordinator-app xmlns='uri:oozie:coordinator:0.2' name='NAME' frequency=\"5\" start='2009-02-01T01:00Z' end='2009-02-01T01:09Z' timezone='UTC' freq_timeunit='MINUTE' end_of_duration='NONE'>"; + String appXml = "<coordinator-app xmlns='uri:oozie:coordinator:0.2' name='NAME' frequency=\"5\" start='2009-02-01T01:00Z'" + + " end='2009-02-01T01:09Z' timezone='UTC' freq_timeunit='MINUTE' end_of_duration='NONE'>"; appXml += "<controls>"; appXml += "<timeout>10</timeout>"; appXml += "<concurrency>2</concurrency>"; @@ -980,7 +981,8 @@ public class TestCoordChangeXCommand extends XDataTestCase { appXml += "</controls>"; appXml += "<input-events>"; appXml += "<data-in name='A' dataset='a'>"; - appXml += "<dataset name='a' frequency='5' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit='MINUTE' end_of_duration='NONE'>"; + appXml += "<dataset name='a' frequency='5' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit='MINUTE'" + + " end_of_duration='NONE'>"; appXml += "<uri-template>file:///tmp/coord/workflows/${YEAR}/${DAY}</uri-template>"; appXml += "</dataset>"; appXml += "<instance>${coord:latest(0)}</instance>"; @@ -988,7 +990,8 @@ public class TestCoordChangeXCommand extends XDataTestCase { appXml += "</input-events>"; appXml += "<output-events>"; appXml += "<data-out name='LOCAL_A' dataset='local_a'>"; - appXml += "<dataset name='local_a' frequency='5' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit='MINUTE' end_of_duration='NONE'>"; + appXml += "<dataset name='local_a' frequency='5' initial-instance='2009-02-01T01:00Z' timezone='UTC' freq_timeunit=" + + "'MINUTE' end_of_duration='NONE'>"; appXml += "<uri-template>file:///tmp/coord/workflows/${YEAR}/${DAY}</uri-template>"; appXml += "</dataset>"; appXml += "<instance>${coord:current(-1)}</instance>"; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java index 111eace..1fe8d3b 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordKillXCommand.java @@ -77,7 +77,8 @@ public class TestCoordKillXCommand extends XDataTestCase { Date end = DateUtils.parseDateOozieTZ(currentDatePlusMonth); CoordinatorJobBean job = addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, false, false, 0); - CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.READY, "coord-action-get.xml", 0); + CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.READY, + "coord-action-get.xml", 0); JPAService jpaService = Services.get().get(JPAService.class); assertNotNull(jpaService); @@ -135,7 +136,8 @@ public class TestCoordKillXCommand extends XDataTestCase { Date end = DateUtils.parseDateOozieTZ(currentDatePlusMonth); CoordinatorJobBean job = addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, false, true, 0); - CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.RUNNING, "coord-action-get.xml", 0); + CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.RUNNING, + "coord-action-get.xml", 0); JPAService jpaService = Services.get().get(JPAService.class); assertNotNull(jpaService); @@ -163,7 +165,8 @@ public class TestCoordKillXCommand extends XDataTestCase { */ public void testCoordKillFailedOnAction() throws Exception { CoordinatorJobBean job = addRecordToCoordJobTable(CoordinatorJob.Status.SUCCEEDED, false, true); - CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.SUCCEEDED, "coord-action-get.xml", 0); + CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.SUCCEEDED, + "coord-action-get.xml", 0); JPAService jpaService = Services.get().get(JPAService.class); assertNotNull(jpaService); @@ -200,7 +203,8 @@ public class TestCoordKillXCommand extends XDataTestCase { assertNotNull(jpaService); CoordinatorJobBean job = addRecordToCoordJobTable(CoordinatorJob.Status.SUCCEEDED, false, true); - CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.RUNNING, "coord-action-get.xml", 0); + CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.RUNNING, + "coord-action-get.xml", 0); job.setAppNamespace(SchemaService.COORDINATOR_NAMESPACE_URI_1); CoordJobQueryExecutor.getInstance().executeUpdate(CoordJobQuery.UPDATE_COORD_JOB_APPNAMESPACE, job); @@ -231,7 +235,8 @@ public class TestCoordKillXCommand extends XDataTestCase { final String testJobId = "0000001-" + new Date().getTime() + "-testCoordKill-C"; CoordinatorJobBean job = addRecordToCoordJobTable(CoordinatorJob.Status.SUCCEEDED, false, true); - CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.READY, "coord-action-get.xml", 0); + CoordinatorActionBean action = addRecordToCoordActionTable(job.getId(), 1, CoordinatorAction.Status.READY, + "coord-action-get.xml", 0); JPAService jpaService = Services.get().get(JPAService.class); assertNotNull(jpaService); http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java index 9a05a85..c408103 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java @@ -452,7 +452,8 @@ public class TestCoordRerunXCommand extends XDataTestCase { @Override public boolean evaluate() throws Exception { CoordinatorAction bean = coordClient.getCoordActionInfo(actionId); - return (bean.getStatus() == CoordinatorAction.Status.READY || bean.getStatus() == CoordinatorAction.Status.SUBMITTED); + return (bean.getStatus() == CoordinatorAction.Status.READY || bean.getStatus() == CoordinatorAction.Status + .SUBMITTED); } }); @@ -563,7 +564,7 @@ public class TestCoordRerunXCommand extends XDataTestCase { // after cleanup assertFalse(fs.exists(success)); } - + /** * Test : rerun with refresh option when input dependency is hcat partition * http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java index dcc97ad..6e52a8e 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordSubmitXCommand.java @@ -82,18 +82,22 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testBasicSubmit() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"${appName}-foo\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"${appName}-foo\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -134,8 +138,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>" - + "hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -152,18 +156,22 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testBasicSubmitWithStartTimeAfterEndTime() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2010-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2010-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -364,7 +372,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { assertTrue(e.getMessage().contains(sc.COORD_INPUT_EVENTS) && e.getMessage().contains("per data-in instance")); } - // CASE 2: Multiple data-in instances specified as separate <instance> tags, but one or more tags are empty. Check works for whitespace in the tags too + // CASE 2: Multiple data-in instances specified as separate <instance> tags, but one or more tags are empty. + // Check works for whitespace in the tags too reader = IOUtils.getResourceAsReader("coord-multiple-input-instance2.xml", -1); writer = new FileWriter(appPathFile); IOUtils.copyCharStream(reader, writer); @@ -538,7 +547,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { assertTrue(e.getMessage().contains(sc.COORD_OUTPUT_EVENTS) && e.getMessage().contains("is empty")); } - // CASE 3: Multiple <instance> tags within data-out should fail coordinator schema validation - different error than above is expected + // CASE 3: Multiple <instance> tags within data-out should fail coordinator schema validation - + // different error than above is expected reader = IOUtils.getResourceAsReader("coord-multiple-output-instance3.xml", -1); writer = new FileWriter(appPathFile); IOUtils.copyCharStream(reader, writer); @@ -612,18 +622,22 @@ public class TestCoordSubmitXCommand extends XDataTestCase { BundleJobBean coordJob = addRecordToBundleJobTable(Job.Status.PREP, false); Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -655,18 +669,22 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testBasicSubmitWithWrongNamespace() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.1\"> <controls> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -695,15 +713,18 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testBasicSubmitWithSLA() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='uri:oozie:coordinator:0.2' " + "xmlns:sla='uri:oozie:sla:0.1'> <controls> <timeout>${coord:minutes(10)}</timeout> " + "<concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"Stats\" frequency=\"${coord:days(1)}\" initial-instance=\"2009-01-01T01:00Z\" " + "timezone=\"UTC\"><uri-template>hcat://foo:11002/myOutputDatabase/myOutputTable/datestamp=${YEAR}${MONTH}${DAY}" + "</uri-template></dataset>" @@ -755,18 +776,22 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSubmitFixedValues() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"60\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"120\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -788,18 +813,22 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSchemaError() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequencyERROR=\"10\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequencyERROR=\"10\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"60\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"120\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -824,7 +853,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSubmitNoDatasets() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> " + "<controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> " @@ -849,7 +879,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSubmitNoUsername() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> " + "<controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> " @@ -877,7 +908,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSubmitNoControls() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> " + "<action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>blah</value> </property> " @@ -901,11 +933,13 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSubmitWithDoneFlag() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " + "timezone=\"UTC\"> <uri-template>file:///tmp/coord/workflows/${YEAR}/${DAY}</uri-template> " + "<done-flag>consume_me</done-flag> </dataset>" @@ -917,7 +951,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { + "<data-in name=\"B\" dataset=\"local_b\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -940,11 +975,13 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSubmitWithVarAppName() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"${NAME}\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"${NAME}\" frequency=\"${coord:days(1)}\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.3\"> <controls> <timeout>10</timeout> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " + "timezone=\"UTC\"> <uri-template>file:///tmp/coord/workflows/${YEAR}/${DAY}</uri-template> " + "<done-flag>consume_me</done-flag> </dataset>" @@ -956,7 +993,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { + "<data-in name=\"B\" dataset=\"local_b\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; @@ -983,7 +1021,8 @@ public class TestCoordSubmitXCommand extends XDataTestCase { public void testSubmitReservedVars() throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"10\" start=\"2009-02-01T01:00Z\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> " + "<action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>blah</value> </property> " @@ -1221,18 +1260,22 @@ public class TestCoordSubmitXCommand extends XDataTestCase { private void _testConfigDefaults(boolean withDefaults) throws Exception { Configuration conf = new XConfiguration(); File appPathFile = new File(getTestCaseDir(), "coordinator.xml"); - String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"${startTime}\" end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + String appXml = "<coordinator-app name=\"NAME\" frequency=\"${coord:days(1)}\" start=\"${startTime}\"" + + " end=\"2009-02-03T23:59Z\" timezone=\"UTC\" " + "xmlns=\"uri:oozie:coordinator:0.2\"> <controls> <concurrency>2</concurrency> " + "<execution>LIFO</execution> </controls> <datasets> " + "<dataset name=\"a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "<dataset name=\"local_a\" frequency=\"${coord:days(7)}\" initial-instance=\"2009-02-01T01:00Z\" " - + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template> </dataset> " + + "timezone=\"UTC\"> <uri-template>" + getTestCaseFileUri("coord/workflows/${YEAR}/${DAY}") + "</uri-template>" + + " </dataset> " + "</datasets> <input-events> " + "<data-in name=\"A\" dataset=\"a\"> <instance>${coord:latest(0)}</instance> </data-in> " + "</input-events> " + "<output-events> <data-out name=\"LOCAL_A\" dataset=\"local_a\"> " - + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow> <app-path>hdfs:///tmp/workflows/</app-path> " + + "<instance>${coord:current(-1)}</instance> </data-out> </output-events> <action> <workflow>" + + " <app-path>hdfs:///tmp/workflows/</app-path> " + "<configuration> <property> <name>inputA</name> <value>${coord:dataIn('A')}</value> </property> " + "<property> <name>inputB</name> <value>${coord:dataOut('LOCAL_A')}</value> " + "</property></configuration> </workflow> </action> </coordinator-app>"; http://git-wip-us.apache.org/repos/asf/oozie/blob/4f404934/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java index 5bee228..1528a52 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordUpdateXCommand.java @@ -271,7 +271,8 @@ public class TestCoordUpdateXCommand extends XDataTestCase { @Override public boolean evaluate() throws Exception { CoordinatorAction bean = coordClient.getCoordActionInfo(actionId); - return (bean.getStatus() == CoordinatorAction.Status.WAITING || bean.getStatus() == CoordinatorAction.Status.SUBMITTED); + return (bean.getStatus() == CoordinatorAction.Status.WAITING || bean.getStatus() + == CoordinatorAction.Status.SUBMITTED); } }); CoordinatorAction bean = coordClient.getCoordActionInfo(actionId);
