You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/10/06 15:41:46 UTC
git commit: AMBARI-7647 Oozie and Falcon service checks fail on
HDP2.2 (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 7f0ea265c -> bb1b5135b
AMBARI-7647 Oozie and Falcon service checks fail on HDP2.2 (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb1b5135
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb1b5135
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb1b5135
Branch: refs/heads/trunk
Commit: bb1b5135bd6ec9f872232a1000d7b683f57b6bff
Parents: 7f0ea26
Author: Dmytro Sen <ds...@hortonworks.com>
Authored: Mon Oct 6 15:26:20 2014 +0300
Committer: Dmytro Sen <ds...@hortonworks.com>
Committed: Mon Oct 6 15:26:20 2014 +0300
----------------------------------------------------------------------
.../services/OOZIE/package/scripts/oozie.py | 2 +-
.../services/OOZIE/package/scripts/params.py | 2 -
.../services/OOZIE/configuration/oozie-site.xml | 75 ++++++++++++++++++++
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 10 +++
4 files changed, 86 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb1b5135/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
index 608b9b1..bba2e09 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py
@@ -121,7 +121,7 @@ def oozie_server_specific(
not_if="ls {pid_file} >/dev/null 2>&1 && !(ps `cat {pid_file}` >/dev/null 2>&1)"
)
- oozie_server_directorties = [params.oozie_pid_dir, params.oozie_log_dir, params.oozie_tmp_dir, params.oozie_data_dir, params.oozie_lib_dir, params.oozie_webapps_dir, params.oozie_webapps_conf_dir]
+ oozie_server_directorties = [params.oozie_pid_dir, params.oozie_log_dir, params.oozie_tmp_dir, params.oozie_data_dir, params.oozie_lib_dir, params.oozie_webapps_dir, params.oozie_webapps_conf_dir, params.oozie_server_dir]
Directory( oozie_server_directorties,
owner = params.oozie_user,
mode = 0755,
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb1b5135/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
index aeccc75..17b26a0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
@@ -33,7 +33,6 @@ rpm_version = default("/configurations/cluster-env/rpm_version", None)
if rpm_version:
hadoop_bin_dir = "/usr/hdp/current/hadoop/bin"
hadoop_lib_home = "/usr/hdp/current/hadoop/lib"
- mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce/*"
oozie_lib_dir = "/usr/hdp/current/oozie/"
oozie_setup_sh = "/usr/hdp/current/oozie/bin/oozie-setup.sh"
oozie_webapps_dir = "/usr/hdp/current/oozie/oozie-server/webapps"
@@ -47,7 +46,6 @@ if rpm_version:
else:
hadoop_bin_dir = "/usr/bin"
hadoop_lib_home = "/usr/lib/hadoop/lib"
- mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*"
oozie_lib_dir = "/var/lib/oozie/"
oozie_setup_sh = "/usr/lib/oozie/bin/oozie-setup.sh"
oozie_webapps_dir = "/var/lib/oozie/oozie-server/webapps/"
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb1b5135/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
index dc56d8b..4a8eab7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/configuration/oozie-site.xml
@@ -28,5 +28,80 @@
additional system stress.
</description>
</property>
+ <property>
+ <name>oozie.services</name>
+ <value>
+ org.apache.oozie.service.SchedulerService,
+ org.apache.oozie.service.InstrumentationService,
+ org.apache.oozie.service.MemoryLocksService,
+ org.apache.oozie.service.UUIDService,
+ org.apache.oozie.service.ELService,
+ org.apache.oozie.service.AuthorizationService,
+ org.apache.oozie.service.UserGroupInformationService,
+ org.apache.oozie.service.HadoopAccessorService,
+ org.apache.oozie.service.JobsConcurrencyService,
+ org.apache.oozie.service.URIHandlerService,
+ org.apache.oozie.service.DagXLogInfoService,
+ org.apache.oozie.service.SchemaService,
+ org.apache.oozie.service.LiteWorkflowAppService,
+ org.apache.oozie.service.JPAService,
+ org.apache.oozie.service.StoreService,
+ org.apache.oozie.service.CoordinatorStoreService,
+ org.apache.oozie.service.SLAStoreService,
+ org.apache.oozie.service.DBLiteWorkflowStoreService,
+ org.apache.oozie.service.CallbackService,
+ org.apache.oozie.service.ShareLibService,
+ org.apache.oozie.service.CallableQueueService,
+ org.apache.oozie.service.ActionService,
+ org.apache.oozie.service.ActionCheckerService,
+ org.apache.oozie.service.RecoveryService,
+ org.apache.oozie.service.PurgeService,
+ org.apache.oozie.service.CoordinatorEngineService,
+ org.apache.oozie.service.BundleEngineService,
+ org.apache.oozie.service.DagEngineService,
+ org.apache.oozie.service.CoordMaterializeTriggerService,
+ org.apache.oozie.service.StatusTransitService,
+ org.apache.oozie.service.PauseTransitService,
+ org.apache.oozie.service.GroupsService,
+ org.apache.oozie.service.ProxyUserService,
+ org.apache.oozie.service.XLogStreamingService,
+ org.apache.oozie.service.JvmPauseMonitorService
+ </value>
+ <description>
+ All services to be created and managed by Oozie Services singleton.
+ Class names must be separated by commas.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.SchemaService.wf.ext.schemas</name>
+ <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</value>
+ </property>
+
+ <property>
+ <name>oozie.service.AuthorizationService.security.enabled</name>
+ <value>false</value>
+ <description>
+ Specifies whether security (user name/admin role) is enabled or not.
+ If disabled any user can manage Oozie system and manage any job.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.service.HadoopAccessorService.kerberos.enabled</name>
+ <value>false</value>
+ <description>
+ Indicates if Oozie is configured to use Kerberos.
+ </description>
+ </property>
+
+ <property>
+ <name>oozie.authentication.simple.anonymous.allowed</name>
+ <value>true</value>
+ <description>
+ Indicates if anonymous requests are allowed.
+ This setting is meaningful only when using 'simple' authentication.
+ </description>
+ </property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb1b5135/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index 576990e..b720a2d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -209,6 +209,11 @@ class TestOozieServer(RMFTestCase):
recursive = True,
mode = 0755,
)
+ self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server',
+ owner = 'oozie',
+ recursive = True,
+ mode = 0755,
+ )
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
@@ -319,6 +324,11 @@ class TestOozieServer(RMFTestCase):
recursive = True,
mode = 0755,
)
+ self.assertResourceCalled('Directory', '/var/lib/oozie/oozie-server',
+ owner = 'oozie',
+ recursive = True,
+ mode = 0755,
+ )
self.assertResourceCalled('Execute', 'cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)