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/04/15 23:31:15 UTC
[1/2] incubator-trafodion git commit: [[TRAFODION 1932]] Fixing
sqnodestart
Repository: incubator-trafodion
Updated Branches:
refs/heads/master f905a745d -> cae7aba40
[[TRAFODION 1932]] Fixing sqnodestart
Removing tools directory for installer makefile (tools should only be used for dev)
Adding new acceptKeys script to easily create known_host file
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0034b3ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0034b3ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0034b3ba
Branch: refs/heads/master
Commit: 0034b3bafe19ed6363a13ba70ccd50642ea670ae
Parents: 0b9b726
Author: Amanda Moran <am...@apache.com>
Authored: Wed Apr 13 19:24:19 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Apr 13 19:24:19 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/sqnodestatus | 4 +--
install/Makefile | 2 +-
install/installer/acceptKeys | 61 ++++++++++++++++++++++++++++++++++
3 files changed, 64 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0034b3ba/core/sqf/sql/scripts/sqnodestatus
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqnodestatus b/core/sqf/sql/scripts/sqnodestatus
index 64bc1fb..a1430b5 100755
--- a/core/sqf/sql/scripts/sqnodestatus
+++ b/core/sqf/sql/scripts/sqnodestatus
@@ -31,7 +31,7 @@
# export SQ_MON_SSH_OPTIONS=' -o "ConnectTimeout 1" -o "ConnectionAttempts 3" '
#
-my $node_context=readpipe("echo \$MY_NODES");
+my $node_context=readpipe("echo \$NODE_LIST");
my %node_hash=();
my $sq_mon_ssh_options=readpipe("echo -n \$SQ_MON_SSH_OPTIONS");
my $json=$ARGV[0];
@@ -40,7 +40,7 @@ my $json=$ARGV[0];
sub main()
{
- $node_context=~s/-w//ig;
+ #$node_context=~s/-w//ig;
#print "node_context=${node_context}";
chomp($node_context);
my @nodes=split(' ',$node_context);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0034b3ba/install/Makefile
----------------------------------------------------------------------
diff --git a/install/Makefile b/install/Makefile
index edb5dd2..014c01c 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -27,7 +27,7 @@ RELEASE_VER ?= 1.0.0_v002
all: pkg-installer
pkg-installer: installer/LICENSE installer/NOTICE
- tar czf installer-$(RELEASE_VER).tar.gz installer
+ tar czf installer-$(RELEASE_VER).tar.gz installer --exclude=tools
installer/LICENSE: ../licenses/LICENSE-install
cp -f $? $@
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0034b3ba/install/installer/acceptKeys
----------------------------------------------------------------------
diff --git a/install/installer/acceptKeys b/install/installer/acceptKeys
new file mode 100755
index 0000000..38a6625
--- /dev/null
+++ b/install/installer/acceptKeys
@@ -0,0 +1,61 @@
+#!/bin/bash
+# @@@ START COPYRIGHT @@@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# @@@ END COPYRIGHT @@@
+
+
+export NODES=""
+
+while [[ $# -gt 0 ]]; do
+ case "$1" in
+ --nodes)
+ NODES=$2
+ shift
+ ;;
+ *)
+ echo "***ERROR: unknown parameter '$1'"
+ print_usage
+ exit -1
+ esac
+ shift
+done
+
+
+
+for node in $NODES
+do
+ ssh -q -oStrictHostKeyChecking=no $node hostname
+ ssh -q -oStrictHostKeyChecking=no localhost hostname
+ if [ $? -ne 0 ]; then
+ echo "***ERROR: Unable to ssh to node $node"
+ exit -1
+ fi
+
+ for nodes in $NODES
+ do
+ ssh -q -oStrictHostKeyChecking=no $node ssh -q -oStrictHostKeyChecking=no $nodes hostname
+ if [ $? -ne 0 ]; then
+ echo "***ERROR: Unable to ssh to node $node"
+ exit -1
+ fi
+ done
+done
+
+
[2/2] incubator-trafodion git commit: Merge [TRAFODION-1932] PR 432
Fixing sqnodestatus
Posted by db...@apache.org.
Merge [TRAFODION-1932] PR 432 Fixing sqnodestatus
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cae7aba4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cae7aba4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cae7aba4
Branch: refs/heads/master
Commit: cae7aba4013c1a83912b3f1c59ea357d0fc60d17
Parents: f905a74 0034b3b
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Apr 15 21:30:25 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Apr 15 21:30:25 2016 +0000
----------------------------------------------------------------------
core/sqf/sql/scripts/sqnodestatus | 4 +--
install/Makefile | 2 +-
install/installer/acceptKeys | 61 ++++++++++++++++++++++++++++++++++
3 files changed, 64 insertions(+), 3 deletions(-)
----------------------------------------------------------------------