Repository: oozie Updated Branches: refs/heads/master 9f48c1e41 -> 2fc2fc9ec
http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/main/resources/oozie-default.xml ---------------------------------------------------------------------- diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml index 6cd7fdf..17155a1 100644 --- a/core/src/main/resources/oozie-default.xml +++ b/core/src/main/resources/oozie-default.xml @@ -222,6 +222,14 @@ </description> </property> + <property> + <name>oozie.service.ConfigurationService.verify.available.properties</name> + <value>true</value> + <description> + Specifies whether the available configurations check is enabled or not. + </description> + </property> + <!-- SchedulerService --> <property> @@ -464,11 +472,11 @@ </property> <property> - <name>oozie.service.coord.normal.default.timeout - </name> - <value>10080</value> - <description>Default timeout for a coordinator action input check (in minutes) for normal job. - </description> + <name>oozie.service.coord.normal.default.timeout + </name> + <value>120</value> + <description>Default timeout for a coordinator action input check (in minutes) for normal job. + -1 means infinite timeout</description> </property> <property> @@ -555,6 +563,24 @@ </description> </property> + <property> + <name>oozie.service.ELService.ext.constants.job-submit</name> + <value> </value> + <description> + EL constant declarations, separated by commas, format is [PREFIX:]NAME=CLASS#CONSTANT. + This property is a convenience property to add extensions without having to include all the built in ones. + </description> + </property> + + <property> + <name>oozie.service.ELService.ext.functions.job-submit</name> + <value> </value> + <description> + EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. + This property is a convenience property to add extensions without having to include all the built in ones. + </description> + </property> + <!-- Workflow specifics --> <property> <name>oozie.service.ELService.constants.workflow</name> @@ -730,6 +756,34 @@ </property> <property> + <name>oozie.service.ELService.ext.functions.coord-job-submit-freq</name> + <value> + </value> + <description> + EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. + This property is a convenience property to add extensions to the built in executors without having to + include all the built in ones. + </description> + </property> + + <property> + <name>oozie.service.ELService.constants.coord-job-wait-timeout</name> + <value> </value> + <description> + EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. + </description> + </property> + + <property> + <name>oozie.service.ELService.ext.constants.coord-job-wait-timeout</name> + <value> </value> + <description> + EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. + This property is a convenience property to add extensions without having to include all the built in ones. + </description> + </property> + + <property> <name>oozie.service.ELService.functions.coord-job-wait-timeout</name> <value> coord:days=org.apache.oozie.coord.CoordELFunctions#ph1_coord_days, @@ -744,13 +798,11 @@ </property> <property> - <name>oozie.service.ELService.ext.functions.coord-job-submit-freq</name> - <value> - </value> + <name>oozie.service.ELService.ext.functions.coord-job-wait-timeout</name> + <value> </value> <description> EL functions declarations, separated by commas, format is [PREFIX:]NAME=CLASS#METHOD. - This property is a convenience property to add extensions to the built in executors without having to - include all the built in ones. + This property is a convenience property to add extensions without having to include all the built in ones. </description> </property> @@ -1308,7 +1360,15 @@ DataSource to be used for connection pooling. </description> </property> - + + <property> + <name>oozie.service.JPAService.connection.properties</name> + <value> </value> + <description> + DataSource connection properties. + </description> + </property> + <property> <name>oozie.service.JPAService.jdbc.driver</name> <value>org.apache.derby.jdbc.EmbeddedDriver</value> @@ -1359,7 +1419,12 @@ <property> <name>oozie.service.SchemaService.wf.ext.schemas</name> - <value>oozie-sla-0.1.xsd,oozie-sla-0.2.xsd</value> + <value> + shell-action-0.1.xsd,shell-action-0.2.xsd,shell-action-0.3.xsd,email-action-0.1.xsd,email-action-0.2.xsd, + hive-action-0.2.xsd,hive-action-0.3.xsd,hive-action-0.4.xsd,hive-action-0.5.xsd,sqoop-action-0.2.xsd, + sqoop-action-0.3.xsd,sqoop-action-0.4.xsd,ssh-action-0.1.xsd,ssh-action-0.2.xsd,distcp-action-0.1.xsd, + distcp-action-0.2.xsd,oozie-sla-0.1.xsd,oozie-sla-0.2.xsd,hive2-action-0.1.xsd + </value> <description> Schemas for additional actions types. @@ -1367,7 +1432,7 @@ if empty Configuration assumes it is NULL. </description> </property> - + <property> <name>oozie.service.SchemaService.coord.ext.schemas</name> <value>oozie-sla-0.1.xsd,oozie-sla-0.2.xsd</value> @@ -1440,8 +1505,14 @@ org.apache.oozie.action.hadoop.FsActionExecutor, org.apache.oozie.action.hadoop.MapReduceActionExecutor, org.apache.oozie.action.hadoop.PigActionExecutor, + org.apache.oozie.action.hadoop.HiveActionExecutor, + org.apache.oozie.action.hadoop.ShellActionExecutor, + org.apache.oozie.action.hadoop.SqoopActionExecutor, + org.apache.oozie.action.hadoop.DistcpActionExecutor, + org.apache.oozie.action.hadoop.Hive2ActionExecutor, org.apache.oozie.action.ssh.SshActionExecutor, - org.apache.oozie.action.oozie.SubWorkflowActionExecutor + org.apache.oozie.action.oozie.SubWorkflowActionExecutor, + org.apache.oozie.action.email.EmailActionExecutor </value> <description> List of ActionExecutors classes (separated by commas). @@ -1529,6 +1600,23 @@ </description> </property> + <!-- LauncherMapper --> + <property> + <name>oozie.action.max.output.data</name> + <value>2048</value> + <description> + Max size in characters for output data. + </description> + </property> + + <property> + <name>oozie.action.fs.glob.max</name> + <value>1000</value> + <description> + Maximum number of globbed files. + </description> + </property> + <!-- JavaActionExecutor --> <!-- This is common to the subclasses of action executors for Java (e.g. map-reduce, pig, hive, java, etc) --> @@ -1541,7 +1629,7 @@ action. </description> </property> - + <!-- HadoopActionExecutor --> <!-- This is common to the subclasses action executors for map-reduce and pig --> @@ -1553,24 +1641,6 @@ </description> </property> - <property> - <name>oozie.action.hadoop.delete.hdfs.tmp.dir</name> - <value>false</value> - <description> - If set to true, it will delete temporary directory at the end of execution of map reduce action. - </description> - </property> - - <!-- PigActionExecutor --> - - <property> - <name>oozie.action.pig.delete.hdfs.tmp.dir</name> - <value>false</value> - <description> - If set to true, it will delete temporary directory at the end of execution of pig action. - </description> - </property> - <!-- SshActionExecutor --> <property> @@ -1718,7 +1788,7 @@ <property> <name>oozie.service.WorkflowAppService.system.libpath</name> - <value>hdfs:///user/${user.name}/share/lib</value> + <value>/user/${user.name}/share/lib</value> <description> System library path to use for workflow applications. This path is added to workflow application if their job properties sets @@ -1727,17 +1797,6 @@ </property> <property> - <name>use.system.libpath.for.mapreduce.and.pig.jobs</name> - <value>false</value> - <description> - If set to true, submissions of MapReduce and Pig jobs will include - automatically the system library path, thus not requiring users to - specify where the Pig JAR files are. Instead, the ones from the system - library path are used. - </description> - </property> - - <property> <name>oozie.command.default.lock.timeout</name> <value>5000</value> <description> @@ -1825,7 +1884,7 @@ <property> <name>oozie.authentication.cookie.domain</name> - <value></value> + <value> </value> <description> The domain to use for the HTTP cookie that stores the authentication token. In order to authentiation to work correctly across multiple hosts @@ -1914,13 +1973,13 @@ </description> </property> - <property> - <name>oozie.service.URIHandlerService.uri.handlers</name> - <value>org.apache.oozie.dependency.FSURIHandler</value> - <description> - Enlist the different uri handlers supported for data availability checks. - </description> - </property> + <property> + <name>oozie.service.URIHandlerService.uri.handlers</name> + <value>org.apache.oozie.dependency.FSURIHandler</value> + <description> + Enlist the different uri handlers supported for data availability checks. + </description> + </property> <!-- Oozie HTTP Notifications --> <property> @@ -2082,22 +2141,35 @@ </description> </property> -<!-- <property> - <name>oozie.instance.id</name> - <value>${OOZIE_HTTP_HOSTNAME}</value> + <name>oozie.http.hostname</name> + <value>localhost</value> <description> - Each Oozie server should have its own unique instance id. The default is system property - =${OOZIE_HTTP_HOSTNAME}= (i.e. the hostname). + Oozie server host name. </description> </property> ---> + <property> + <name>oozie.http.port</name> + <value>11000</value> + <description> + Oozie server port. + </description> + </property> + + <property> + <name>oozie.instance.id</name> + <value>${oozie.http.hostname}</value> + <description> + Each Oozie server should have its own unique instance id. The default is system property + =${OOZIE_HTTP_HOSTNAME}= (i.e. the hostname). + </description> + </property> <!-- Sharelib Configuration --> <property> <name>oozie.service.ShareLibService.mapping.file</name> - <value></value> + <value> </value> <description> Sharelib mapping files contains list of key=value, where key will be the sharelib name for the action and value is a comma separated list of @@ -2126,6 +2198,22 @@ </property> <property> + <name>oozie.service.ShareLibService.temp.sharelib.retention.days</name> + <value>7</value> + <description> + ShareLib retention time in days. + </description> + </property> + + <property> + <name>oozie.action.ship.launcher.jar</name> + <value>false</value> + <description> + Specifies whether launcher jar is shipped or not. + </description> + </property> + + <property> <name>oozie.action.jobinfo.enable</name> <value>false</value> <description> @@ -2150,7 +2238,7 @@ </property> <property> - <name>oozie.service.XLogStreamingService.max.actionlist.log.scan.duration</name> + <name>oozie.service.XLogStreamingService.actionlist.max.log.scan.duration</name> <value>-1</value> <description> Max log scan duration in hours for coordinator job when list of actions are specified. @@ -2211,6 +2299,15 @@ </property> <property> + <name>oozie.service.AbandonedCoordCheckerService.check.delay + </name> + <value>60</value> + <description> + Delay, in minutes, at which AbandonedCoordCheckerService should run. + </description> + </property> + + <property> <name>oozie.service.AbandonedCoordCheckerService.failure.limit </name> <value>25</value> http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java b/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java index aa9db5e..e1f314e 100644 --- a/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java +++ b/core/src/test/java/org/apache/oozie/action/email/TestEmailActionExecutor.java @@ -43,12 +43,6 @@ public class TestEmailActionExecutor extends ActionExecutorTestCase { server.start(); } - @Override - protected void setSystemProps() throws Exception { - super.setSystemProps(); - setSystemProperty("oozie.service.ActionService.executor.classes", EmailActionExecutor.class.getName()); - } - private Context createNormalContext(String actionXml) throws Exception { EmailActionExecutor ae = new EmailActionExecutor(); http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java index d6ac554..939a332 100644 --- a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java +++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java @@ -40,12 +40,6 @@ import org.apache.oozie.util.XConfiguration; public class TestDistCpActionExecutor extends ActionExecutorTestCase{ - @Override - protected void setSystemProps() throws Exception { - super.setSystemProps(); - setSystemProperty("oozie.service.ActionService.executor.classes", DistcpActionExecutor.class.getName()); - } - @SuppressWarnings("unchecked") public void testSetupMethods() throws Exception { DistcpActionExecutor ae = new DistcpActionExecutor(); http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/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 dcc440a..7795963 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 @@ -58,16 +58,9 @@ public class TestShellActionExecutor extends ActionExecutorTestCase { : "ls -ltr\necho $1 $2\nexit 1"; private static final String PERL_SCRIPT_CONTENT = "print \"MY_VAR=TESTING\";"; - @Override - protected void setSystemProps() throws Exception { - super.setSystemProps(); - setSystemProperty("oozie.service.ActionService.executor.classes", ShellActionExecutor.class.getName()); - } - /** * Verify if the ShellActionExecutor indeed setups the basic stuffs * - * @param launcherJarShouldExist * @throws Exception */ public void testSetupMethods() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionNotificationXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionNotificationXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionNotificationXCommand.java index 7742dd4..b58ecd9 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionNotificationXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionNotificationXCommand.java @@ -73,6 +73,6 @@ public class TestCoordActionNotificationXCommand extends XTestCase { command.call(); long end = System.currentTimeMillis(); Assert.assertTrue(end - start >= 50); - Assert.assertTrue(end - start <= NotificationXCommand.NOTIFICATION_URL_CONNECTION_TIMEOUT_DEFAULT); + Assert.assertTrue(end - start <= 10000); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/command/wf/TestNotificationXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestNotificationXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestNotificationXCommand.java index b260747..ad2fbd7 100644 --- a/core/src/test/java/org/apache/oozie/command/wf/TestNotificationXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/wf/TestNotificationXCommand.java @@ -73,6 +73,6 @@ public class TestNotificationXCommand extends XTestCase { command.call(); long end = System.currentTimeMillis(); Assert.assertTrue(end - start >= 50); - Assert.assertTrue(end - start < NotificationXCommand.NOTIFICATION_URL_CONNECTION_TIMEOUT_DEFAULT); + Assert.assertTrue(end - start < 10000); } } http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java index 239fc86..fa128df 100644 --- a/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java @@ -126,7 +126,6 @@ public class TestReRunXCommand extends XDataTestCase { */ public void testRerunFork() throws Exception { // We need the shell schema and action for this test - Services.get().getConf().set(ActionService.CONF_ACTION_EXECUTOR_EXT_CLASSES, ShellActionExecutor.class.getName()); Services.get().setService(ActionService.class); Services.get().getConf().set(SchemaService.WF_CONF_EXT_SCHEMAS, "shell-action-0.3.xsd"); Services.get().setService(SchemaService.class); http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java b/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java index 2c008fd..d09bfc0 100644 --- a/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java +++ b/core/src/test/java/org/apache/oozie/service/TestConfigurationService.java @@ -19,15 +19,45 @@ package org.apache.oozie.service; import org.apache.hadoop.conf.Configuration; +import org.apache.oozie.action.hadoop.CredentialsProvider; +import org.apache.oozie.action.hadoop.DistcpActionExecutor; +import org.apache.oozie.action.hadoop.JavaActionExecutor; +import org.apache.oozie.action.hadoop.LauncherMapper; +import org.apache.oozie.command.coord.CoordActionInputCheckXCommand; +import org.apache.oozie.command.coord.CoordSubmitXCommand; +import org.apache.oozie.command.wf.JobXCommand; +import org.apache.oozie.compression.CodecFactory; +import org.apache.oozie.event.listener.ZKConnectionListener; +import org.apache.oozie.executor.jpa.CoordActionGetForInfoJPAExecutor; +import org.apache.oozie.servlet.AuthFilter; +import org.apache.oozie.servlet.V1JobServlet; +import org.apache.oozie.sla.service.SLAService; import org.apache.oozie.test.XTestCase; +import org.apache.oozie.util.ConfigUtils; import org.apache.oozie.util.IOUtils; +import org.apache.oozie.util.XLogFilter; +import org.apache.oozie.workflow.lite.LiteWorkflowAppParser; -import java.io.DataOutputStream; import java.io.File; import java.io.FileOutputStream; public class TestConfigurationService extends XTestCase { + Services services; + + @Override + protected void setUp() throws Exception { + super.setUp(); + services = new Services(); + services.init(); + } + + @Override + protected void tearDown() throws Exception { + services.destroy(); + super.tearDown(); + } + private void prepareOozieConfDir(String oozieSite) throws Exception { prepareOozieConfDir(oozieSite, ConfigurationService.SITE_CONFIG_FILE); } @@ -116,4 +146,131 @@ public class TestConfigurationService extends XTestCase { assertEquals("true", conf.get("oozie.is.awesome")); cl.destroy(); } + + public void testOozieConfig() throws Exception{ + prepareOozieConfDir("oozie-site2.xml"); + ConfigurationService cl = new ConfigurationService(); + cl.init(null); + assertEquals("SITE1", cl.getConf().get("oozie.system.id")); + assertEquals("SITE2", cl.getConf().get("oozie.dummy")); + assertEquals("SITE1", ConfigurationService.get(cl.getConf(), "oozie.system.id")); + assertEquals("SITE2", ConfigurationService.get(cl.getConf(), "oozie.dummy")); + + assertNull(cl.getConf().get("oozie.test.nonexist")); + assertEquals(ConfigUtils.STRING_DEFAULT, ConfigurationService.get(cl.getConf(), "oozie.test.nonexist")); + assertEquals(ConfigUtils.BOOLEAN_DEFAULT, ConfigurationService.getBoolean(cl.getConf(), "oozie.test.nonexist")); + + Configuration testConf = new Configuration(false); + assertEquals(ConfigUtils.STRING_DEFAULT, ConfigurationService.get("test.nonexist")); + assertEquals(ConfigUtils.STRING_DEFAULT, ConfigurationService.get(testConf, "test.nonexist")); + testConf.set("test.nonexist", "another-conf"); + assertEquals(ConfigUtils.STRING_DEFAULT, ConfigurationService.get("test.nonexist")); + assertEquals("another-conf", ConfigurationService.get(testConf, "test.nonexist")); + Services.get().getConf().set("test.nonexist", "oozie-conf"); + assertEquals("oozie-conf", ConfigurationService.get("test.nonexist")); + assertEquals("another-conf", ConfigurationService.get(testConf, "test.nonexist")); + testConf.clear(); + assertEquals("oozie-conf", ConfigurationService.get("test.nonexist")); + assertEquals(ConfigUtils.STRING_DEFAULT, ConfigurationService.get(testConf, "test.nonexist")); + + assertEquals("http://localhost:8080/oozie/callback";, ConfigurationService.get(CallbackService.CONF_BASE_URL)); + assertEquals("gz", ConfigurationService.get(CodecFactory.COMPRESSION_OUTPUT_CODEC)); + assertEquals(4096, ConfigurationService.getInt(XLogStreamingService.STREAM_BUFFER_LEN)); + assertEquals(10000, ConfigurationService.getLong(JvmPauseMonitorService.WARN_THRESHOLD_KEY)); + assertEquals(60, ConfigurationService.getInt(InstrumentationService.CONF_LOGGING_INTERVAL)); + assertEquals(30, ConfigurationService.getInt(PurgeService.CONF_OLDER_THAN)); + assertEquals(7, ConfigurationService.getInt(PurgeService.COORD_CONF_OLDER_THAN)); + assertEquals(7, ConfigurationService.getInt(PurgeService.BUNDLE_CONF_OLDER_THAN)); + assertEquals(100, ConfigurationService.getInt(PurgeService.PURGE_LIMIT)); + assertEquals(3600, ConfigurationService.getInt(PurgeService.CONF_PURGE_INTERVAL)); + assertEquals(300, ConfigurationService.getInt(CoordMaterializeTriggerService.CONF_LOOKUP_INTERVAL)); + assertEquals(0, ConfigurationService.getInt(CoordMaterializeTriggerService.CONF_SCHEDULING_INTERVAL)); + assertEquals(300, cl.getConf().getInt( + CoordMaterializeTriggerService.CONF_SCHEDULING_INTERVAL, + ConfigurationService.getInt(CoordMaterializeTriggerService.CONF_LOOKUP_INTERVAL))); + assertEquals(3600, ConfigurationService.getInt(CoordMaterializeTriggerService.CONF_MATERIALIZATION_WINDOW)); + assertEquals(10, ConfigurationService.getInt(CoordMaterializeTriggerService.CONF_CALLABLE_BATCH_SIZE)); + assertEquals(50, ConfigurationService.getInt(CoordMaterializeTriggerService + .CONF_MATERIALIZATION_SYSTEM_LIMIT)); + assertEquals(0.05f, ConfigurationService.getFloat(CoordSubmitXCommand.CONF_MAT_THROTTLING_FACTOR)); + + assertEquals("oozie", ConfigurationService.get(JPAService.CONF_DB_SCHEMA)); + assertEquals("jdbc:hsqldb:mem:oozie-db;create=true", ConfigurationService.get(JPAService.CONF_URL)); + assertEquals("org.hsqldb.jdbcDriver", ConfigurationService.get(JPAService.CONF_DRIVER)); + assertEquals("sa", ConfigurationService.get(JPAService.CONF_USERNAME)); + assertEquals("", ConfigurationService.get(JPAService.CONF_PASSWORD).trim()); + assertEquals("10", ConfigurationService.get(JPAService.CONF_MAX_ACTIVE_CONN).trim()); + assertEquals("org.apache.commons.dbcp.BasicDataSource", + ConfigurationService.get(JPAService.CONF_CONN_DATA_SOURCE)); + assertEquals("", ConfigurationService.get(JPAService.CONF_CONN_PROPERTIES).trim()); + assertEquals("300000", ConfigurationService.get(JPAService.CONF_VALIDATE_DB_CONN_EVICTION_INTERVAL).trim()); + assertEquals("10", ConfigurationService.get(JPAService.CONF_VALIDATE_DB_CONN_EVICTION_NUM).trim()); + + assertEquals(2048, ConfigurationService.getInt(LauncherMapper.CONF_OOZIE_ACTION_MAX_OUTPUT_DATA)); + assertEquals("http://localhost:8080/oozie?job=";, ConfigurationService.get(JobXCommand.CONF_CONSOLE_URL)); + assertEquals(false, ConfigurationService.getBoolean(JavaActionExecutor.CONF_HADOOP_YARN_UBER_MODE)); + assertEquals(false, ConfigurationService.getBoolean(HadoopAccessorService.KERBEROS_AUTH_ENABLED)); + + assertEquals(0, ConfigurationService.getStrings("no.defined").length); + assertEquals(0, ConfigurationService.getStrings(CredentialsProvider.CRED_KEY).length); + assertEquals(1, ConfigurationService.getStrings(DistcpActionExecutor.CLASS_NAMES).length); + assertEquals("distcp=org.apache.hadoop.tools.DistCp", + ConfigurationService.getStrings(DistcpActionExecutor.CLASS_NAMES)[0]); + assertEquals(1, ConfigurationService.getInt(CoordActionInputCheckXCommand.COORD_EXECUTION_NONE_TOLERANCE)); + assertEquals(1000, ConfigurationService.getInt(V1JobServlet.COORD_ACTIONS_DEFAULT_LENGTH)); + + assertEquals(cl.getConf().get(LiteWorkflowStoreService.CONF_USER_RETRY_ERROR_CODE), ConfigurationService.get + (LiteWorkflowStoreService.CONF_USER_RETRY_ERROR_CODE)); + assertEquals(cl.getConf().get(LiteWorkflowStoreService.CONF_USER_RETRY_ERROR_CODE_EXT), + ConfigurationService.get(LiteWorkflowStoreService.CONF_USER_RETRY_ERROR_CODE_EXT)); + + assertEquals("simple", cl.getConf().get(AuthFilter.OOZIE_PREFIX + AuthFilter.AUTH_TYPE)); + assertEquals("36000", cl.getConf().get(AuthFilter.OOZIE_PREFIX + AuthFilter.AUTH_TOKEN_VALIDITY)); + assertEquals(" ", cl.getConf().get(AuthFilter.OOZIE_PREFIX + AuthFilter.COOKIE_DOMAIN)); + assertEquals("true", cl.getConf().get(AuthFilter.OOZIE_PREFIX + "simple.anonymous.allowed")); + assertEquals("HTTP/localhost@LOCALHOST", cl.getConf().get(AuthFilter.OOZIE_PREFIX + "kerberos.principal")); + assertEquals(cl.getConf().get(HadoopAccessorService.KERBEROS_KEYTAB), + cl.getConf().get(AuthFilter.OOZIE_PREFIX + "kerberos.keytab")); + assertEquals("DEFAULT", cl.getConf().get(AuthFilter.OOZIE_PREFIX + "kerberos.name.rules")); + + assertEquals(true, ConfigurationService.getBoolean(LiteWorkflowAppParser.VALIDATE_FORK_JOIN)); + assertEquals(false, + ConfigurationService.getBoolean(CoordActionGetForInfoJPAExecutor.COORD_GET_ALL_COLS_FOR_ACTION)); + assertEquals(1, ConfigurationService.getStrings(URIHandlerService.URI_HANDLERS).length); + assertEquals("org.apache.oozie.dependency.FSURIHandler", + ConfigurationService.getStrings(URIHandlerService.URI_HANDLERS)[0]); + assertEquals(cl.getConf().getBoolean("oozie.hadoop-2.0.2-alpha.workaround.for.distributed.cache", false), + ConfigurationService.getBoolean(LauncherMapper.HADOOP2_WORKAROUND_DISTRIBUTED_CACHE)); + + assertEquals("org.apache.oozie.event.MemoryEventQueue", + (ConfigurationService.getClass(cl.getConf(), EventHandlerService.CONF_EVENT_QUEUE).getName())); + assertEquals(-1, ConfigurationService.getInt(XLogFilter.MAX_SCAN_DURATION)); + assertEquals(-1, ConfigurationService.getInt(XLogFilter.MAX_ACTIONLIST_SCAN_DURATION)); + assertEquals(10000, ConfigurationService.getLong(JvmPauseMonitorService.WARN_THRESHOLD_KEY)); + assertEquals(1000, ConfigurationService.getLong(JvmPauseMonitorService.INFO_THRESHOLD_KEY)); + + assertEquals(10000, ConfigurationService.getInt(CallableQueueService.CONF_QUEUE_SIZE)); + assertEquals(10, ConfigurationService.getInt(CallableQueueService.CONF_THREADS)); + assertEquals(3, ConfigurationService.getInt(CallableQueueService.CONF_CALLABLE_CONCURRENCY)); + assertEquals(120, ConfigurationService.getInt(CoordSubmitXCommand.CONF_DEFAULT_TIMEOUT_NORMAL)); + + assertEquals(300, ConfigurationService.getInt(ZKLocksService.REAPING_THRESHOLD)); + assertEquals(2, ConfigurationService.getInt(ZKLocksService.REAPING_THREADS)); + assertEquals(10000, ConfigurationService.getInt(JobXCommand.DEFAULT_REQUEUE_DELAY)); + + assertEquals(0, ConfigurationService.getStrings(AbandonedCoordCheckerService.TO_ADDRESS).length); + assertEquals(25, ConfigurationService.getInt(AbandonedCoordCheckerService.CONF_FAILURE_LEN)); + assertEquals(false, ConfigurationService.getBoolean(AbandonedCoordCheckerService.CONF_JOB_KILL)); + assertEquals(60, ConfigurationService.getInt(AbandonedCoordCheckerService.CONF_CHECK_DELAY)); + assertEquals(1440, ConfigurationService.getInt(AbandonedCoordCheckerService.CONF_CHECK_INTERVAL)); + assertEquals(2880, ConfigurationService.getInt(AbandonedCoordCheckerService.CONF_JOB_OLDER_THAN)); + + assertEquals(true, ConfigurationService.getBoolean(ZKConnectionListener.CONF_SHUTDOWN_ON_TIMEOUT)); + + assertEquals(7, ConfigurationService.getInt(ShareLibService.LAUNCHERJAR_LIB_RETENTION)); + assertEquals(5000, ConfigurationService.getInt(SLAService.CONF_CAPACITY)); + + cl.destroy(); + } + } http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/service/TestJobsConcurrencyService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestJobsConcurrencyService.java b/core/src/test/java/org/apache/oozie/service/TestJobsConcurrencyService.java index 503d0c9..011a574 100644 --- a/core/src/test/java/org/apache/oozie/service/TestJobsConcurrencyService.java +++ b/core/src/test/java/org/apache/oozie/service/TestJobsConcurrencyService.java @@ -119,7 +119,7 @@ public class TestJobsConcurrencyService extends XTestCase { try { jcs.init(Services.get()); jcs.instrument(instr); - String servers = System.getProperty("oozie.instance.id") + "=" + ConfigUtils.getOozieEffectiveUrl(); + String servers = ConfigurationService.get("oozie.instance.id") + "=" + ConfigUtils.getOozieEffectiveUrl(); assertEquals(servers, instr.getVariables().get("oozie").get("servers").getValue()); } finally { jcs.destroy(); http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java b/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java index db3f6eb..c70ef79 100644 --- a/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java +++ b/core/src/test/java/org/apache/oozie/sla/TestSLACalculatorMemory.java @@ -96,7 +96,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { @Test public void testLoadOnRestart() throws Exception { SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); SLARegistrationBean slaRegBean1 = _createSLARegistration("job-1", AppType.WORKFLOW_JOB); String jobId1 = slaRegBean1.getId(); SLARegistrationBean slaRegBean2 = _createSLARegistration("job-2", AppType.WORKFLOW_JOB); @@ -156,7 +156,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { BatchQueryExecutor.getInstance().executeBatchInsertUpdateDelete(null, updateList, null); slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); assertEquals(2, slaCalcMemory.size()); @@ -201,7 +201,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testWorkflowJobSLAStatusOnRestart() throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd"); SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); SLARegistrationBean slaRegBean1 = _createSLARegistration("job-1", AppType.WORKFLOW_JOB); String jobId1 = slaRegBean1.getId(); slaRegBean1.setExpectedEnd(sdf.parse("2013-03-07")); @@ -228,7 +228,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { WorkflowJobQueryExecutor.getInstance().insert(wjb); slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); // As job succeeded, it should not be in memory assertEquals(0, slaCalcMemory.size()); @@ -257,7 +257,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { SLASummaryQueryExecutor.getInstance().executeUpdate(SLASummaryQuery.UPDATE_SLA_SUMMARY_ALL, slaSummaryBean); slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); assertEquals(0, slaCalcMemory.size()); slaSummary = SLASummaryQueryExecutor.getInstance().get(SLASummaryQuery.GET_SLA_SUMMARY, jobId1); @@ -281,7 +281,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { SLASummaryQueryExecutor.getInstance().executeUpdate(SLASummaryQuery.UPDATE_SLA_SUMMARY_ALL, slaSummaryBean); slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); assertEquals(1, slaCalcMemory.size()); SLACalcStatus calc = slaCalcMemory.get(jobId1); @@ -297,7 +297,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testWorkflowActionSLAStatusOnRestart() throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd"); SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); SLARegistrationBean slaRegBean1 = _createSLARegistration("job@1", AppType.WORKFLOW_ACTION); String jobId1 = slaRegBean1.getId(); slaRegBean1.setExpectedEnd(sdf.parse("2013-03-07")); @@ -322,7 +322,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { jpaService.execute(wfInsertCmd); slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); // As job succeeded, it should not be in memory assertEquals(0, slaCalcMemory.size()); @@ -343,7 +343,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testCoordinatorActionSLAStatusOnRestart() throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd"); SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); SLARegistrationBean slaRegBean1 = _createSLARegistration("job@1", AppType.COORDINATOR_ACTION); String jobId1 = slaRegBean1.getId(); slaRegBean1.setExpectedEnd(sdf.parse("2013-03-07")); @@ -373,7 +373,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { WorkflowJobQueryExecutor.getInstance().insert(wjb); slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); // As job succeeded, it should not be in memory assertEquals(0, slaCalcMemory.size()); @@ -394,7 +394,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testSLAEvents1() throws Exception { SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); EventHandlerService ehs = Services.get().get(EventHandlerService.class); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); WorkflowJobBean job1 = addRecordToWfJobTable(WorkflowJob.Status.PREP, WorkflowInstance.Status.PREP); SLARegistrationBean slaRegBean = _createSLARegistration(job1.getId(), AppType.WORKFLOW_JOB); slaRegBean.setExpectedStart(new Date(System.currentTimeMillis() - 1 * 1 * 3600 * 1000)); // 1 hour @@ -445,7 +445,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testSLAEvents2() throws Exception { SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); EventHandlerService ehs = Services.get().get(EventHandlerService.class); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); WorkflowJobBean job1 = addRecordToWfJobTable(WorkflowJob.Status.PREP, WorkflowInstance.Status.PREP); SLARegistrationBean slaRegBean = _createSLARegistration(job1.getId(), AppType.WORKFLOW_JOB); @@ -505,7 +505,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { // test start-miss EventHandlerService ehs = Services.get().get(EventHandlerService.class); SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); WorkflowJobBean job1 = addRecordToWfJobTable(WorkflowJob.Status.PREP, WorkflowInstance.Status.PREP); SLARegistrationBean slaRegBean = _createSLARegistration(job1.getId(), AppType.WORKFLOW_JOB); Date startTime = new Date(System.currentTimeMillis() - 1 * 1 * 3600 * 1000); // 1 hour back @@ -534,7 +534,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testDuplicateEndMiss() throws Exception { EventHandlerService ehs = Services.get().get(EventHandlerService.class); SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); WorkflowJobBean job1 = addRecordToWfJobTable(WorkflowJob.Status.RUNNING, WorkflowInstance.Status.RUNNING); SLARegistrationBean slaRegBean = _createSLARegistration(job1.getId(), AppType.WORKFLOW_JOB); Date startTime = new Date(System.currentTimeMillis() + 1 * 1 * 3600 * 1000); // 1 hour ahead @@ -577,7 +577,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testSLAHistorySet() throws Exception { EventHandlerService ehs = Services.get().get(EventHandlerService.class); SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); WorkflowJobBean job1 = addRecordToWfJobTable(WorkflowJob.Status.PREP, WorkflowInstance.Status.PREP); SLARegistrationBean slaRegBean = _createSLARegistration(job1.getId(), AppType.WORKFLOW_JOB); Date startTime = new Date(System.currentTimeMillis() - 1 * 1 * 3600 * 1000); @@ -614,7 +614,7 @@ public class TestSLACalculatorMemory extends XDataTestCase { public void testHistoryPurge() throws Exception{ EventHandlerService ehs = Services.get().get(EventHandlerService.class); SLACalculatorMemory slaCalcMemory = new SLACalculatorMemory(); - slaCalcMemory.init(new Configuration(false)); + slaCalcMemory.init(Services.get().getConf()); WorkflowJobBean job1 = addRecordToWfJobTable(WorkflowJob.Status.PREP, WorkflowInstance.Status.PREP); SLARegistrationBean slaRegBean = _createSLARegistration(job1.getId(), AppType.WORKFLOW_JOB); Date startTime = new Date(System.currentTimeMillis() - 1 * 1 * 3600 * 1000); http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java index b755353..93ad168 100644 --- a/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java +++ b/core/src/test/java/org/apache/oozie/workflow/lite/TestLiteWorkflowAppParser.java @@ -30,6 +30,7 @@ import org.apache.oozie.service.ActionService; import org.apache.oozie.service.LiteWorkflowStoreService; import org.apache.oozie.service.SchemaService; import org.apache.oozie.service.Services; +import org.apache.oozie.service.TestLiteWorkflowAppService; import org.apache.oozie.workflow.WorkflowException; import org.apache.oozie.workflow.lite.TestLiteWorkflowLib.TestActionNodeHandler; import org.apache.oozie.workflow.lite.TestLiteWorkflowLib.TestDecisionNodeHandler; @@ -48,8 +49,6 @@ public class TestLiteWorkflowAppParser extends XTestCase { super.setUp(); setSystemProperty("oozie.service.SchemaService.wf.ext.schemas", "hive-action-0.2.xsd"); new Services().init(); - Services.get().get(ActionService.class).register(HiveActionExecutor.class); - Services.get().get(ActionService.class).register(DistcpActionExecutor.class); } @Override @@ -298,17 +297,7 @@ public class TestLiteWorkflowAppParser extends XTestCase { parser.validateAndParse(IOUtils.getResourceAsReader("wf-schema-valid.xml", -1), new Configuration()); try { - parser.validateAndParse(IOUtils.getResourceAsReader("wf-loop1-invalid.xml", -1), new Configuration()); - fail(); - } - catch (WorkflowException ex) { - assertEquals(ErrorCode.E0707, ex.getErrorCode()); - } - catch (Exception ex) { - fail(); - } - - try { + // Check TestLiteWorkflowAppService.TestActionExecutor is registered. parser.validateAndParse(IOUtils.getResourceAsReader("wf-unsupported-action.xml", -1), new Configuration()); fail(); } http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/core/src/test/resources/wf-unsupported-action.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/wf-unsupported-action.xml b/core/src/test/resources/wf-unsupported-action.xml index 7a796cb..5ac92af 100644 --- a/core/src/test/resources/wf-unsupported-action.xml +++ b/core/src/test/resources/wf-unsupported-action.xml @@ -19,13 +19,16 @@ <start to="a"/> <action name="a"> - <email> - <to>to</to> - <subject>subject</subject> - <message/> - </email> - <ok to="b"/> - <error to="b"/> + <test xmlns="uri:test"> + <signal-value>${wf:conf('signal-value')}</signal-value> + <external-status>${wf:conf('external-status')}</external-status> + <error>${wf:conf('error')}</error> + <avoid-set-execution-data>${wf:conf('avoid-set-execution-data')}</avoid-set-execution-data> + <avoid-set-end-data>${wf:conf('avoid-set-end-data')}</avoid-set-end-data> + <running-mode>${wf:conf('running-mode')}</running-mode> + </test> + <ok to="end"/> + <error to="kill"/> </action> <end name="b"/> http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 8ed6dd8..a57365e 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-1890 Make oozie-site empty and reconcile defaults between oozie-default and the code (seoeun25 via rkanter) OOZIE-2001 Workflow re-runs doesn't update coord action status (jaydeepvishwakarma via shwethags) OOZIE-2048 HadoopAccessorService should also process ssl_client.xml (venkatnrangan via bzhang) OOZIE-2047 Oozie does not support Hive tables that use datatypes introduced since Hive 0.8 (venkatnrangan via bzhang) http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java index 87c97d8..c28839c 100644 --- a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java +++ b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java @@ -63,12 +63,6 @@ public class TestHiveActionExecutor extends ActionExecutorTestCase { private static final String OUTPUT_DIRNAME = "output"; private static final String DATA_FILENAME = "data.txt"; - protected void setSystemProps() throws Exception { - super.setSystemProps(); - setSystemProperty("oozie.service.ActionService.executor.classes", - HiveActionExecutor.class.getName()); - } - @SuppressWarnings("unchecked") public void testSetupMethods() throws Exception { HiveActionExecutor ae = new HiveActionExecutor(); http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java index 4923fe3..9c3128f 100644 --- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java +++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java @@ -54,13 +54,12 @@ public class LauncherMapper<K1, V1, K2, V2> implements Mapper<K1, V1, K2, V2>, R static final String CONF_OOZIE_ACTION_MAIN_CLASS = "oozie.launcher.action.main.class"; static final String ACTION_PREFIX = "oozie.action."; - static final String CONF_OOZIE_ACTION_MAX_OUTPUT_DATA = ACTION_PREFIX + "max.output.data"; + public static final String CONF_OOZIE_ACTION_MAX_OUTPUT_DATA = ACTION_PREFIX + "max.output.data"; static final String CONF_OOZIE_ACTION_MAIN_ARG_COUNT = ACTION_PREFIX + "main.arg.count"; static final String CONF_OOZIE_ACTION_MAIN_ARG_PREFIX = ACTION_PREFIX + "main.arg."; static final String CONF_OOZIE_EXTERNAL_STATS_MAX_SIZE = "oozie.external.stats.max.size"; static final String OOZIE_ACTION_CONFIG_CLASS = ACTION_PREFIX + "config.class"; - static final String CONF_OOZIE_ACTION_FS_GLOB_MAX = "oozie.action.fs.glob.max"; - static final int GLOB_MAX_DEFAULT = 1000; + static final String CONF_OOZIE_ACTION_FS_GLOB_MAX = ACTION_PREFIX + "fs.glob.max"; static final String COUNTER_GROUP = "oozie.launcher"; static final String COUNTER_LAUNCHER_ERROR = "oozie.launcher.error"; @@ -78,6 +77,7 @@ public class LauncherMapper<K1, V1, K2, V2> implements Mapper<K1, V1, K2, V2>, R static final String ACTION_DATA_STATS = "stats.properties"; static final String ACTION_DATA_NEW_ID = "newId"; static final String ACTION_DATA_ERROR_PROPS = "error.properties"; + public static final String HADOOP2_WORKAROUND_DISTRIBUTED_CACHE = "oozie.hadoop-2.0.2-alpha.workaround.for.distributed.cache"; private void setRecoveryId(Configuration launcherConf, Path actionDir, String recoveryId) throws LauncherException { try { http://git-wip-us.apache.org/repos/asf/oozie/blob/2fc2fc9e/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java ---------------------------------------------------------------------- diff --git a/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java b/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java index 8686a23..6474092 100644 --- a/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java +++ b/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java @@ -119,12 +119,6 @@ public class TestSqoopActionExecutor extends ActionExecutorTestCase { "<arg>{3}</arg>" + "</sqoop>"; - @Override - protected void setSystemProps() throws Exception { - super.setSystemProps(); - setSystemProperty("oozie.service.ActionService.executor.classes", SqoopActionExecutor.class.getName()); - } - public void testSetupMethods() throws Exception { SqoopActionExecutor ae = new SqoopActionExecutor(); assertEquals(SqoopMain.class, ae.getLauncherClasses().get(0));
