You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sv...@apache.org on 2017/01/31 00:34:33 UTC

[3/4] incubator-trafodion git commit: [TRAFODION-2452] Clean-up of install/upgrade via ambari

[TRAFODION-2452] Clean-up of install/upgrade via ambari

Fix permission issue with installing new trafodion version.
The DCS status checks were running as root, which caused $TRAF_HOME/tmp
to get created as root instead of trafodion user, which caused sqgen to fail.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bbe80666
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bbe80666
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bbe80666

Branch: refs/heads/master
Commit: bbe806665ed9a55d1ec8aa15ebd6cc6bb5d9fc10
Parents: 5c01e4a
Author: Steve Varnau <sv...@apache.org>
Authored: Wed Jan 25 23:19:18 2017 +0000
Committer: Steve Varnau <sv...@apache.org>
Committed: Wed Jan 25 23:19:18 2017 +0000

----------------------------------------------------------------------
 .../common-services/TRAFODION/2.1/package/scripts/trafodiondcs.py  | 2 +-
 .../common-services/TRAFODION/2.1/package/scripts/trafodionnode.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bbe80666/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodiondcs.py
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodiondcs.py b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodiondcs.py
index 24b9623..92688b3 100755
--- a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodiondcs.py
+++ b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodiondcs.py
@@ -47,7 +47,7 @@ class DCS(Script):
     cmd = "source ~%s/.bashrc >/dev/null 2>&1; ls $DCS_INSTALL_DIR/tmp/dcs*master.pid" % status_params.traf_user
     ofile = TemporaryFile()
     try:
-      Execute(cmd,stdout=ofile) # cannot switch user in status mode for some reason
+      Execute(cmd,stdout=ofile,user=status_params.traf_user)
     except:
       ofile.close()
       raise ComponentIsNotRunning()

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/bbe80666/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionnode.py
----------------------------------------------------------------------
diff --git a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionnode.py b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionnode.py
index 5bb8ca7..26d8178 100755
--- a/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionnode.py
+++ b/install/ambari-installer/traf-mpack/common-services/TRAFODION/2.1/package/scripts/trafodionnode.py
@@ -91,7 +91,7 @@ class Node(Script):
          content=InlineTemplate(params.traf_env_template,trim_blocks=False),
          mode=0644)
     # initialize & verify env (e.g., bashrc creates $TRAF_HOME/tmp as trafodion user)
-    cmd = "source ~" + params.traf_user + "/.bashrc ; ls -l $TRAF_HOME/tmp"
+    cmd = "source ~/.bashrc"
     Execute(cmd,user=params.traf_user)
 
     ##################