This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.1-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 0f8cb383a32974435a6448de30b8cc0f8e979301
Author: zhangchunyang <zhangchunyang0...@gmail.com>
AuthorDate: Sun Jun 28 11:37:59 2020 +0800
[bugfix] remove Conflicting configuration sudo and user (#3038)
Co-authored-by: zhangchunyang1024 <zhangchunyang0...@gamil.com>
---
.../DOLPHIN/1.3.0/package/scripts/dolphin_alert_service.py | 3 ++-
.../DOLPHIN/1.3.0/package/scripts/dolphin_api_service.py | 3 ++-
.../DOLPHIN/1.3.0/package/scripts/dolphin_logger_service.py | 4 ++--
.../DOLPHIN/1.3.0/package/scripts/dolphin_master_service.py | 3 ++-
.../DOLPHIN/1.3.0/package/scripts/dolphin_worker_service.py | 3 ++-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_alert_service.py
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_alert_service.py
index 62255a3..e78c38d 100644
---
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_alert_service.py
+++
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_alert_service.py
@@ -26,7 +26,8 @@ class DolphinAlertService(Script):
import params
env.set_params(params)
self.install_packages(env)
- Execute(('chmod', '-R', '777', params.dolphin_home),
user=params.dolphin_user, sudo=True)
+ Execute(('chmod', '-R', '777', params.dolphin_home))
+ Execute(('chown', '-R', params.dolphin_user + ":" +
params.dolphin_group, params.dolphin_home))
def configure(self, env):
import params
diff --git
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_api_service.py
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_api_service.py
index bdc18fb..5a28924 100644
---
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_api_service.py
+++
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_api_service.py
@@ -26,7 +26,8 @@ class DolphinApiService(Script):
import params
env.set_params(params)
self.install_packages(env)
- Execute(('chmod', '-R', '777', params.dolphin_home),
user=params.dolphin_user, sudo=True)
+ Execute(('chmod', '-R', '777', params.dolphin_home))
+ Execute(('chown', '-R', params.dolphin_user + ":" +
params.dolphin_group, params.dolphin_home))
def configure(self, env):
import params
diff --git
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_logger_service.py
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_logger_service.py
index f1c19bd..fb47e13 100644
---
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_logger_service.py
+++
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_logger_service.py
@@ -26,8 +26,8 @@ class DolphinLoggerService(Script):
import params
env.set_params(params)
self.install_packages(env)
- Execute(('chmod', '-R', '777', params.dolphin_home),
user=params.dolphin_user, sudo=True)
-
+ Execute(('chmod', '-R', '777', params.dolphin_home))
+ Execute(('chown', '-R', params.dolphin_user + ":" +
params.dolphin_group, params.dolphin_home))
def configure(self, env):
import params
params.pika_slave = True
diff --git
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_master_service.py
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_master_service.py
index 6ee7ecf..8d64935 100644
---
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_master_service.py
+++
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_master_service.py
@@ -27,7 +27,8 @@ class DolphinMasterService(Script):
import params
env.set_params(params)
self.install_packages(env)
- Execute(('chmod', '-R', '777', params.dolphin_home),
user=params.dolphin_user, sudo=True)
+ Execute(('chmod', '-R', '777', params.dolphin_home))
+ Execute(('chown', '-R', params.dolphin_user + ":" +
params.dolphin_group, params.dolphin_home))
def configure(self, env):
import params
diff --git
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_worker_service.py
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_worker_service.py
index 2d145ee..1f542c0 100644
---
a/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_worker_service.py
+++
b/ambari_plugin/common-services/DOLPHIN/1.3.0/package/scripts/dolphin_worker_service.py
@@ -26,7 +26,8 @@ class DolphinWorkerService(Script):
import params
env.set_params(params)
self.install_packages(env)
- Execute(('chmod', '-R', '777', params.dolphin_home),
user=params.dolphin_user, sudo=True)
+ Execute(('chmod', '-R', '777', params.dolphin_home))
+ Execute(('chown', '-R', params.dolphin_user + ":" + params.dolphin_group,
params.dolphin_home))
def configure(self, env):
import params
