You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/18 16:22:03 UTC

[01/11] incubator-trafodion git commit: Adding cat of config file for installation debugging

Repository: incubator-trafodion
Updated Branches:
  refs/heads/release2.0 6c7826c62 -> 9415d7f06


Adding cat of config file for installation debugging


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

Branch: refs/heads/release2.0
Commit: 28f51144bdd6d5af68db41a26675e2df32f9500e
Parents: 10adf4b
Author: Amanda Moran <am...@apache.com>
Authored: Wed May 11 13:26:28 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed May 11 13:26:28 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_config_check | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/28f51144/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index dd883f0..5ed0b44 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -33,6 +33,7 @@ source $TRAF_CONFIG
 function majorErrorFound {
    if [[ "$errorFound" == "1" ]]; then
       cat $ERROR_LOG
+      cat /etc/trafodion/trafodion_config
       echo
       exit -1
    fi


[10/11] incubator-trafodion git commit: Making check more clear

Posted by db...@apache.org.
Making check more clear


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

Branch: refs/heads/release2.0
Commit: 48c419a112258bb1ca5d16f781f66d0b17657e22
Parents: 8951412
Author: Amanda Moran <am...@apache.com>
Authored: Tue May 17 16:55:00 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Tue May 17 16:55:00 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_config_check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/48c419a1/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 0f0d346..14d5511 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -701,7 +701,7 @@ function checkClouderaVersion {
 
 if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
    #Check that Cloudera 5.2 or 5.3 are not installed.
-   if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]]; then
+   if [[ "$CDH_5_4_SUPPORT" == "Y" ]]; then
       nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.4.*)
       #Check that Cloudera 5.[n>4].* is not installed.
       if [[ -z $nameOfVersion ]]; then


[05/11] incubator-trafodion git commit: Printing path

Posted by db...@apache.org.
Printing path


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

Branch: refs/heads/release2.0
Commit: 1e1dca8c0a5ac2413cfaa07fb6cdd5bce8a7c0c3
Parents: 95c553a
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 19:15:53 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 19:15:53 2016 +0000

----------------------------------------------------------------------
 install/installer/dcs_installer  | 1 +
 install/installer/rest_installer | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e1dca8c/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index fa07753..7da8567 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -133,6 +133,7 @@ cd $DCS_INSTALL_PATH
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
    DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs)
    DCS_DIR=$SQ_ROOT/$DCS_DIR
+   echo "***INFO: DCS Install Directory: $DCS_DIR"
 else
    # untar DCS build into install directory
    echo "***INFO: untarring build file $DCS_BUILD_FILE"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e1dca8c/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index a9af0a0..ece48a0 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -96,6 +96,8 @@ cd $REST_INSTALL_PATH
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
    REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
    REST_DIR=$($SQ_ROOT/$REST_DIR)
+   echo "***INFO: Rest Install Directory: $REST_DIR"
+
 else
    # untar REST build into install directory
    echo "***INFO: untarring build file $REST_BUILD_FILE"


[02/11] incubator-trafodion git commit: More debugging

Posted by db...@apache.org.
More debugging


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

Branch: refs/heads/release2.0
Commit: 42b407c651f76adc29e37eec6eb13ad645d65ba6
Parents: 28f5114
Author: Amanda Moran <am...@apache.com>
Authored: Wed May 11 13:32:41 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed May 11 13:32:41 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_config_check | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/42b407c6/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 5ed0b44..7a63180 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -938,6 +938,7 @@ if [[ ! -z $install_features_path ]]; then
       fi           
    fi
    source $install_features_path
+   cat $install_features_path
 
    sudo chmod 777 $TRAF_CONFIG
    echo "export CDH_5_3_HDP_2_2_SUPPORT=\"$CDH_5_3_HDP_2_2_SUPPORT\"" >> $TRAF_CONFIG


[03/11] incubator-trafodion git commit: Merge branch 'release2.0' of github.com:apache/incubator-trafodion into TRAFODION-1985

Posted by db...@apache.org.
Merge branch 'release2.0' of github.com:apache/incubator-trafodion into TRAFODION-1985


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

Branch: refs/heads/release2.0
Commit: 19b8d1f513622fd970efb6edcbe93da833599f7b
Parents: 42b407c 8feea90
Author: Amanda Moran <am...@apache.com>
Authored: Thu May 12 16:56:05 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Thu May 12 16:56:05 2016 +0000

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 .rat-excludes                                   |    2 +-
 core/Makefile                                   |    2 +-
 core/conn/Makefile                              |    5 +-
 core/rest/Makefile                              |   16 +-
 core/rest/pom.xml                               |   34 +-
 core/rest/src/assembly/all.xml                  |   10 +-
 core/sqf/.gitignore                             |    4 +
 core/sqf/Makefile                               |   20 +-
 .../java/org/trafodion/libmgmt/FileMgmt.java    |    1 +
 dcs/Makefile                                    |   17 +-
 dcs/pom.xml                                     |   38 +-
 dcs/src/assembly/all.xml                        |    8 +-
 licenses/Makefile                               |   15 +-
 licenses/lic-dcs-bin                            |  652 -------
 licenses/lic-dcs-src                            |   69 -
 licenses/lic-rest-bin                           | 1416 --------------
 licenses/lic-server-bin                         | 1834 ++++++++++++++++++
 licenses/lic-server-src                         |   69 +
 licenses/not-dcs-bin                            |   20 -
 licenses/not-rest-bin                           |   20 -
 licenses/note-server-bin                        |   20 +
 22 files changed, 1967 insertions(+), 2306 deletions(-)
----------------------------------------------------------------------



[08/11] incubator-trafodion git commit: removing sudo

Posted by db...@apache.org.
removing sudo


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

Branch: refs/heads/release2.0
Commit: c0552b02c30e4da6aa419fbc76e763a3d62b0a3e
Parents: 0205fce
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 21:55:52 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 21:55:52 2016 +0000

----------------------------------------------------------------------
 install/installer/dcs_installer  | 2 +-
 install/installer/rest_installer | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c0552b02/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index 7da8567..8c9d544 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,7 +131,7 @@ mkdir -p $DCS_INSTALL_PATH
 cd $DCS_INSTALL_PATH
 
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
-   DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs)
+   DCS_DIR=$(ls $SQ_ROOT | grep dcs)
    DCS_DIR=$SQ_ROOT/$DCS_DIR
    echo "***INFO: DCS Install Directory: $DCS_DIR"
 else

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c0552b02/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index ae89807..7e52448 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,7 +94,7 @@ mkdir -p $REST_INSTALL_PATH
 cd $REST_INSTALL_PATH
 
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
-   REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
+   REST_DIR=$(ls $SQ_ROOT | grep rest)
    REST_DIR=$SQ_ROOT/$REST_DIR
    echo "***INFO: Rest Install Directory: $REST_DIR"
 


[04/11] incubator-trafodion git commit: TRAFODION-1993 Expand DCS and REST directories

Posted by db...@apache.org.
TRAFODION-1993 Expand DCS and REST directories


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

Branch: refs/heads/release2.0
Commit: 95c553a91772f4a8908655887ede11c539c6ed7c
Parents: 19b8d1f
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 19:14:03 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 19:14:03 2016 +0000

----------------------------------------------------------------------
 install/installer/dcs_installer  | 3 ++-
 install/installer/rest_installer | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/95c553a9/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index cf5e744..fa07753 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -131,7 +131,8 @@ mkdir -p $DCS_INSTALL_PATH
 cd $DCS_INSTALL_PATH
 
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
-   DCS_DIR="$SQ_ROOT/dcs*"
+   DCS_DIR=$(sudo ls $SQ_ROOT | grep dcs)
+   DCS_DIR=$SQ_ROOT/$DCS_DIR
 else
    # untar DCS build into install directory
    echo "***INFO: untarring build file $DCS_BUILD_FILE"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/95c553a9/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index e3cde2e..a9af0a0 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -94,7 +94,8 @@ mkdir -p $REST_INSTALL_PATH
 cd $REST_INSTALL_PATH
 
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
-   REST_DIR="$SQ_ROOT/rest*"
+   REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
+   REST_DIR=$($SQ_ROOT/$REST_DIR)
 else
    # untar REST build into install directory
    echo "***INFO: untarring build file $REST_BUILD_FILE"


[09/11] incubator-trafodion git commit: [[TRAFODION -1997]] Prevent Cloudera install on 5.5/6

Posted by db...@apache.org.
[[TRAFODION -1997]] Prevent Cloudera install on 5.5/6


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

Branch: refs/heads/release2.0
Commit: 895141273cd7ef8b029f68891a10fb00553327a3
Parents: c0552b0
Author: Amanda Moran <am...@apache.com>
Authored: Mon May 16 22:15:34 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Mon May 16 22:15:34 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_config_check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/89514127/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 49637c3..0f0d346 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -702,7 +702,7 @@ function checkClouderaVersion {
 if [[ $CDH_5_3_HDP_2_2_SUPPORT == "N" ]]; then
    #Check that Cloudera 5.2 or 5.3 are not installed.
    if [[ "$CDH_5_4_SUPPORT" == "Y" ]] || [[ "$CDH_5_5_SUPPORT" == "Y" ]]; then
-      nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.[4-6].*)
+      nameOfVersion=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh5.4.*)
       #Check that Cloudera 5.[n>4].* is not installed.
       if [[ -z $nameOfVersion ]]; then
          versionInstalled=$(ssh -q -n $node grep "Version" $HOME/hbaseVersion.txt | sed 's/,.*//' | sed 's/.*\-//' | grep cdh[5-9].[7-9].* | wc -l)


[11/11] incubator-trafodion git commit: Merge [TRAFODION-1993] PR 482 Several fixes

Posted by db...@apache.org.
Merge [TRAFODION-1993] PR 482 Several fixes


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

Branch: refs/heads/release2.0
Commit: 9415d7f06a8c6cf9af591b23573193825e9d27fa
Parents: 6c7826c 48c419a
Author: Dave Birdsall <db...@apache.org>
Authored: Wed May 18 16:20:56 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed May 18 16:20:56 2016 +0000

----------------------------------------------------------------------
 install/installer/dcs_installer     |  4 +++-
 install/installer/rest_installer    |  5 ++++-
 install/installer/traf_config_check | 14 +++++++++++---
 3 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[07/11] incubator-trafodion git commit: Merge error for JAVA check!

Posted by db...@apache.org.
Merge error for JAVA check!


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

Branch: refs/heads/release2.0
Commit: 0205fcef88c30a6a42bdc4dd2cb3f040b2ab17f6
Parents: 15fbc0b
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 21:37:02 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 21:37:02 2016 +0000

----------------------------------------------------------------------
 install/installer/traf_config_check | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0205fcef/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 7a63180..49637c3 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -414,7 +414,13 @@ else
          #Checking if using 1.7.0_n
          if [[ "${THIS_JVM_VER:18:1}" -eq "0" ]] && [[ "$temp_JAVA" -eq "$JAVA7" ]]; then
             if [[ "${THIS_JVM_VER:20:1}" -eq "0" ]] || [[ "${THIS_JVM_VER:20:2}" -lt $JAVA65 ]]; then
-               error="true"
+               #If Java is **less** than than 1.7.0_65 the next command will fail.
+               #Install will fail anyways if less than 1.7.0_65
+               #Will not fail if Java is 1.7.0_100 or greater
+               #Temporary fix to support Java 7 upgrades greater than 100
+               if [[ "${THIS_JVM_VER:20:3}" -lt $JAVA_65 ]]; then
+                  error="true"
+               fi
             fi
          fi
 


[06/11] incubator-trafodion git commit: Typo

Posted by db...@apache.org.
Typo


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

Branch: refs/heads/release2.0
Commit: 15fbc0ba54d8fc000d1ab5fc77c151df8911e608
Parents: 1e1dca8
Author: Amanda Moran <am...@apache.com>
Authored: Fri May 13 20:45:54 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri May 13 20:45:54 2016 +0000

----------------------------------------------------------------------
 install/installer/rest_installer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/15fbc0ba/install/installer/rest_installer
----------------------------------------------------------------------
diff --git a/install/installer/rest_installer b/install/installer/rest_installer
index ece48a0..ae89807 100755
--- a/install/installer/rest_installer
+++ b/install/installer/rest_installer
@@ -95,7 +95,7 @@ cd $REST_INSTALL_PATH
 
 if [[ "$ONE_TAR_INSTALL" == "Y" ]]; then
    REST_DIR=$(sudo ls $SQ_ROOT | grep rest)
-   REST_DIR=$($SQ_ROOT/$REST_DIR)
+   REST_DIR=$SQ_ROOT/$REST_DIR
    echo "***INFO: Rest Install Directory: $REST_DIR"
 
 else