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/27 16:41:02 UTC
[07/15] incubator-trafodion git commit: Linux odbc driver will now be
installed along with Server component Installer tar is packaged and
distributed with 'make pacakge-all' Fixed minor issues
Linux odbc driver will now be installed along with Server component
Installer tar is packaged and distributed with 'make pacakge-all'
Fixed minor issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9623bf17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9623bf17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9623bf17
Branch: refs/heads/master
Commit: 9623bf179cfee064deda6af60a17cb907b9ab4d4
Parents: 92aaccd
Author: Anuradha Hegde <he...@edev05.esgyn.local>
Authored: Tue May 24 05:44:10 2016 +0000
Committer: Anuradha Hegde <he...@edev05.esgyn.local>
Committed: Tue May 24 05:44:10 2016 +0000
----------------------------------------------------------------------
Makefile | 1 +
core/Makefile | 10 ++++++++--
core/conn/jdbcT4/src/main/java/T4Messages.properties | 4 ++--
core/conn/odbc/src/odbc/Makefile | 3 ++-
core/dbsecurity/scripts/sqcertgen | 5 -----
core/dbsecurity/scripts/update_auth | 9 +--------
install/Makefile | 6 ++++--
install/installer/traf_cloudera_mods | 1 -
install/installer/traf_config | 6 ------
9 files changed, 18 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 7258f30..c69e51e 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ package-src: $(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE
git archive --format tar --prefix $(SRCDIR)-${TRAFODION_VER}-incubating/ HEAD > distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
tar rf distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar $^
gzip distribution/$(SRCDIR)-${TRAFODION_VER}-incubating-src.tar
+ rm -rf $(SRCDIR)-${TRAFODION_VER}-incubating LICENSE
$(SRCDIR)-${TRAFODION_VER}-incubating/LICENSE:
cd licenses && $(MAKE) LICENSE-src
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/Makefile
----------------------------------------------------------------------
diff --git a/core/Makefile b/core/Makefile
index c6c3606..63ce053 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -28,7 +28,7 @@ include macros.gmk
# Make Targets
.PHONY: all dbsecurity foundation $(MPI_TARGET) ndcs ci jdbc_jar jdbc_type2_jar sqroot $(SEAMONSTER_TARGET) verhdr dcs rest odb
-.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests pkg-dcs-tests check-copyrights
+.PHONY: package package-all pkg-product pkg-sql-regress pkg-phx-tests pkg-dcs-tests check-copyrights pkg-installer
################
### Main targets
@@ -113,6 +113,7 @@ clean: sqroot
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
cd sql/lib_mgmt && $(MAKE) clean
+ cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
cleanall: sqroot eclipseclean cleantests
@@ -128,9 +129,10 @@ cleanall: sqroot eclipseclean cleantests
cd conn/odb && $(MAKE) clean
cd ../dcs && $(MAKE) clean
cd sql/lib_mgmt && $(MAKE) cleanall
+ cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
-package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests
+package-all: package pkg-sql-regress pkg-phx-tests pkg-dcs-tests pkg-installer
pkg-product: all
cd sqf && $(MAKE) package 2>&1 | sed -e "s/$$/ ##(Package)/";exit $${PIPESTATUS[0]}
@@ -150,6 +152,10 @@ pkg-phx-tests: all
pkg-dcs-tests: all
cd sqf && $(MAKE) package-dcs 2>&1 | sed -e "s/$$/ ##(Package dcs tests)/";exit $${PIPESTATUS[0]}
+# Package installer
+pkg-installer:
+ cd ../install && $(MAKE) 2>&1 | sed -e "s/$$/ ##(Package installer)/";exit $${PIPESTATUS[0]}
+
version:
@cd sqf; unset SQ_VERBOSE; source sqenv.sh ; echo "$${TRAFODION_VER}"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/conn/jdbcT4/src/main/java/T4Messages.properties
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/T4Messages.properties b/core/conn/jdbcT4/src/main/java/T4Messages.properties
index 24d6fb1..70f4c0c 100644
--- a/core/conn/jdbcT4/src/main/java/T4Messages.properties
+++ b/core/conn/jdbcT4/src/main/java/T4Messages.properties
@@ -492,7 +492,7 @@ driver_err_error_from_server_msg=An error was returned from the server. Error: {
driver_err_error_from_server_sqlstate=HY000
driver_err_error_from_server_sqlcode=29156
-problem_with_server_read_msg=There was a problem reading from the server
+problem_with_server_read_msg=Server aborted abnormally or Connection timed out
problem_with_server_read_sqlstate=HY000
problem_with_server_read_sqlcode=29157
@@ -683,4 +683,4 @@ cursor_is_before_first_row_sqlcode=29189
cursor_after_last_row_msg=The cursor is after last row, which could be due to the result set containing no rows, or all rows have been retrieved.
cursor_after_last_row_sqlstate=HY109
-cursor_after_last_row_sqlcode=29190
\ No newline at end of file
+cursor_after_last_row_sqlcode=29190
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/conn/odbc/src/odbc/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/Makefile b/core/conn/odbc/src/odbc/Makefile
index 7c7ccb9..29ec9ca 100644
--- a/core/conn/odbc/src/odbc/Makefile
+++ b/core/conn/odbc/src/odbc/Makefile
@@ -72,7 +72,8 @@ cleanall: cleanallndcs cleanlnx_drvr
include $(MY_SQROOT)/macros.gmk
bldlnx_drvr:
cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli;$(MAKE) -f makefile.lnx linux64_$(SQ_BUILD_TYPE)
- cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -p relfiles/linux64/lib* $(LIBEXPDIR);ln -s $(LIBEXPDIR)/libicudata.so.44 $(LIBEXPDIR)/libicudata.so;ln -s $(LIBEXPDIR)/libicuuc.so.44 $(LIBEXPDIR)/libicuuc.so;ln -s $(LIBEXPDIR)/libtrafodbc_l64.so $(LIBEXPDIR)/libtrafodbc64.so;ln -s $(LIBEXPDIR)/libtrafodbc_l64_drvr.so $(LIBEXPDIR)/libtrafodbc_drvr64.so;cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(MY_SQROOT)/samples
+ cd $(MY_SQROOT)/../conn/unixodbc/odbc/odbcclient/unixcli/package;rm -rf *.gz $(LIBEXPDIR)/libicu* $(LIBEXPDIR)/libtrafodbc*; ./mklnxpkg.sh -f; cp -p trafodbc_Linux64_pkg.tar.gz $(MY_SQROOT)/../conn/clients/TRAF_ODBC_Linux_Driver_64.tar.gz; cp -Pf relfiles/linux64/lib* $(LIBEXPDIR);cp -p relfiles/linux64/{connect_test.cpp,TRAFDSN,runconnect_test.sh} $(MY_SQROOT)/samples
+ cd $(LIBEXPDIR);ln -sf libicudata.so.44 libicudata.so;ln -sf libicuuc.so.44 libicuuc.so;ln -sf libtrafodbc_l64.so libtrafodbc64.so;ln -sf libtrafodbc_l64_drvr.so libtrafodbc_drvr64.so
# Linux ODBC driver clean targets
.PHONY: cleanlnx_drvr
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/dbsecurity/scripts/sqcertgen
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/sqcertgen b/core/dbsecurity/scripts/sqcertgen
index 68012b5..571b596 100755
--- a/core/dbsecurity/scripts/sqcertgen
+++ b/core/dbsecurity/scripts/sqcertgen
@@ -172,11 +172,6 @@ server|ss|selfsigned)
echo " Certificate/Private key created in directory :"$CERTDIR
echo "***********************************************************"
echo
- echo "***********************************************************"
- echo " Updating Authentication Configuration"
- echo "***********************************************************"
-
- $MY_SQROOT/sql/scripts/update_auth
;;
view_pk)
if [ x$2 != x ]
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/core/dbsecurity/scripts/update_auth
----------------------------------------------------------------------
diff --git a/core/dbsecurity/scripts/update_auth b/core/dbsecurity/scripts/update_auth
index c25d280..9b5fb6f 100755
--- a/core/dbsecurity/scripts/update_auth
+++ b/core/dbsecurity/scripts/update_auth
@@ -69,14 +69,7 @@ if [ -z "$CACERTS_DIR" ]; then
CACERTS_DIR=$HOME/cacerts
fi
-# Creating folders for storing certificates
-
-# Note - For Bright Clusters, installer sets up all files on the head node
-# and then puts the copy of the image on the slave nodes.
-# Hence any file copied to the slave nodes by scripts via pdcp get wiped out.
-# All the files should first get copied to the local node.
-# In case of clusters this is the head node - not part of MY_NODES.
-
+# Creating folders for storing CA certificates
echo "Creating folders for storing certificates"
if [ ! -d "$CACERTS_DIR" ]; then
mkdir -p -m 700 $CACERTS_DIR;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index 014c01c..5499cea 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -22,12 +22,14 @@
# * Installer version number (starting from 1 for each Trafodion version)
#
# "v000" indicates an internal/development version of installer
-RELEASE_VER ?= 1.0.0_v002
+RELEASE_VER ?= $(shell echo $(TRAFODION_VER))
all: pkg-installer
pkg-installer: installer/LICENSE installer/NOTICE
tar czf installer-$(RELEASE_VER).tar.gz installer --exclude=tools
+ mkdir -p ../distribution
+ mv installer-$(RELEASE_VER).tar.gz ../distribution
installer/LICENSE: ../licenses/LICENSE-install
cp -f $? $@
@@ -42,4 +44,4 @@ version:
@echo "$(RELEASE_VER)"
clean:
- rm installer-$(RELEASE_VER).tar.gz
+ rm -f installer-$(RELEASE_VER).tar.gz
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/install/installer/traf_cloudera_mods
----------------------------------------------------------------------
diff --git a/install/installer/traf_cloudera_mods b/install/installer/traf_cloudera_mods
index 2f98efa..ed4af27 100755
--- a/install/installer/traf_cloudera_mods
+++ b/install/installer/traf_cloudera_mods
@@ -319,7 +319,6 @@ restart_info=$(curl -k -X POST -u $ADMIN:$PASSWORD \
$URL/api/v1/clusters/$CLUSTER_NAME/commands/restart)
echo $restart_info
command_id=$(echo $restart_info | grep id | awk '{print $4}' | sed -e 's@,@@' )
-echo "***DEBUG: Cloudera command_id=$command_id"
# poll until restart is completed as a restart can take a while
active=1
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9623bf17/install/installer/traf_config
----------------------------------------------------------------------
diff --git a/install/installer/traf_config b/install/installer/traf_config
index 7bffc03..c6cf371 100755
--- a/install/installer/traf_config
+++ b/install/installer/traf_config
@@ -72,12 +72,6 @@ if [[ "$userId" != "$TRAF_USER" ]]; then
fi
#============================================
-echo "*************************"
-echo "*************************"
-echo " Trafodion Configuration"
-echo "*************************"
-echo "*************************"
-#============================================
# Check if an existing instance is up
process_count=$(cstat -noheader 2>/dev/null | wc -l)
if [ "$process_count" -ne 0 ]; then