You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2017/02/23 16:49:03 UTC
[5/8] incubator-trafodion git commit: [TRAFODION-2489] pyinstaller -
sqconfig on single node [TRAFODION-2490] pyinstaller - admin user setup gives
syntax error
[TRAFODION-2489] pyinstaller - sqconfig on single node
[TRAFODION-2490] pyinstaller - admin user setup gives syntax error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/63f947c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/63f947c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/63f947c7
Branch: refs/heads/release2.1
Commit: 63f947c77c3a250a760be44b13a964319074e9e7
Parents: 965f659
Author: Eason <hf...@gmail.com>
Authored: Mon Feb 20 14:02:04 2017 +0800
Committer: Eason <hf...@gmail.com>
Committed: Mon Feb 20 14:02:04 2017 +0800
----------------------------------------------------------------------
install/python-installer/scripts/traf_sqconfig.py | 9 ++++++---
install/python-installer/scripts/traf_start.py | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/63f947c7/install/python-installer/scripts/traf_sqconfig.py
----------------------------------------------------------------------
diff --git a/install/python-installer/scripts/traf_sqconfig.py b/install/python-installer/scripts/traf_sqconfig.py
index 6c8c188..83fb1db 100755
--- a/install/python-installer/scripts/traf_sqconfig.py
+++ b/install/python-installer/scripts/traf_sqconfig.py
@@ -43,9 +43,12 @@ def run():
core = int(core)-1 if int(core) <= 256 else 255
lines = ['begin node\n']
- for node_id, node in enumerate(nodes):
- line = 'node-id=%s;node-name=%s;cores=0-%d;processors=%s;roles=connection,aggregation,storage\n' % (node_id, node, core, processor)
- lines.append(line)
+ if len(nodes) == 1:
+ lines.append('_virtualnodes 2\n')
+ else:
+ for node_id, node in enumerate(nodes):
+ line = 'node-id=%s;node-name=%s;cores=0-%d;processors=%s;roles=connection,aggregation,storage\n' % (node_id, node, core, processor)
+ lines.append(line)
lines.append('end node\n')
lines.append('\n')
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/63f947c7/install/python-installer/scripts/traf_start.py
----------------------------------------------------------------------
diff --git a/install/python-installer/scripts/traf_start.py b/install/python-installer/scripts/traf_start.py
index 395f678..86c940c 100755
--- a/install/python-installer/scripts/traf_start.py
+++ b/install/python-installer/scripts/traf_start.py
@@ -58,9 +58,9 @@ def run():
run_cmd('rm -rf %s' % tmp_file)
if dbcfgs['ldap_security'] == 'Y':
- run_cmd('echo "initialize authorization; alter user DB__ROOT set external name \"%s\";" | sqlci > %s' % (dbcfgs['db_root_user'], tmp_file))
+ run_cmd('echo "initialize authorization; alter user DB__ROOT set external name \\\"%s\\\";" | sqlci > %s' % (dbcfgs['db_root_user'], tmp_file))
if dbcfgs.has_key('db_admin_user'):
- run_cmd('echo "alter user DB__ADMIN set external name \"%s\";" | sqlci >> %s' % (dbcfgs['db_admin_user'], tmp_file))
+ run_cmd('echo "alter user DB__ADMIN set external name \\\"%s\\\";" | sqlci >> %s' % (dbcfgs['db_admin_user'], tmp_file))
secure_output = cmd_output('cat %s' % tmp_file)
if 'ERROR' in secure_output: