You are viewing a plain text version of this content. The canonical link for it is here.
Posted to codereview@trafodion.apache.org by zcorrea <gi...@git.apache.org> on 2018/06/12 01:18:50 UTC
[GitHub] trafodion pull request #1604: Trafodion 2884
GitHub user zcorrea opened a pull request:
https://github.com/apache/trafodion/pull/1604
Trafodion 2884
Implements: https://issues.apache.org/jira/browse/TRAFODION-2884
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/zcorrea/trafodion TRAFODION-2884
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/trafodion/pull/1604.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1604
----
commit f375acdc8b199d56c6c39ab13ba09a014b080f90
Author: Dave George <dg...@...>
Date: 2018-02-26T18:07:50Z
first nameserver commit.
commit 577c985fb1afcf0a3398065de1670f6725ab887d
Author: Dave George <dg...@...>
Date: 2018-02-26T19:39:50Z
commit nameserver.
commit c61d2f7a6cd352fd91ba9c6fd1a848160c4e22b4
Author: Dave George <dg...@...>
Date: 2018-02-26T20:27:06Z
Fix SB for nameserver changes.
commit a66a1f1e1eb9dd3fdeb1b5170bb37c3500b13d7f
Author: Dave George <de...@...>
Date: 2018-02-26T22:21:22Z
Convert atomic_t to SB_Atomic_Int.
commit 13d566f72233d46e22454cd55b6540512562f8bc
Author: Dave George <de...@...>
Date: 2018-03-01T14:05:07Z
update nameserver.
commit b7cf5267b13fe947b28aa951d69b3834792b7238
Author: Dave George <de...@...>
Date: 2018-03-02T19:09:38Z
add missing file.
commit 611c284fcb753846e785abd540fa7ef91d73d759
Author: Dave George <de...@...>
Date: 2018-03-02T19:16:11Z
Add log4cxx for ns.
commit 668bcaff56a60a3a57d050146975233cbcfac275
Author: Zalo Correa <za...@...>
Date: 2018-03-02T21:18:56Z
Merge remote branch 'origin/master' into TRAFODION-2884
Conflicts:
core/sqf/monitor/linux/cluster.cxx
core/sqf/monitor/linux/cluster.h
core/sqf/monitor/linux/monitor.cxx
core/sqf/monitor/linux/monitor.h
core/sqf/monitor/linux/reqprocinfo.cxx
commit 20ef4c097f6321bbffbf67b9adaebe12a6df7eeb
Author: Zalo Correa <za...@...>
Date: 2018-03-02T21:19:31Z
Merge branch 'TRAFODION-2884' of github.com:zcorrea/trafodion into TRAFODION-2884
commit 4b8a23630155cb8162428fcdd06747478bcac652
Author: Zalo Correa <za...@...>
Date: 2018-03-02T23:30:19Z
Defaulted NameServer to disabled
commit 660b9cf22530589e3a18d2de078dc71b895f6211
Author: Dave George <de...@...>
Date: 2018-03-05T21:31:24Z
nameserver configuration changes.
commit 10b30d84e2983346efa1689e1088a9e48b9f2bbd
Author: Dave George <de...@...>
Date: 2018-03-05T22:09:08Z
Merge branch 'TRAFODION-2884' of github.com:zcorrea/trafodion into TRAFODION-2884
Conflicts:
core/sqf/monitor/linux/msgdef.h
core/sqf/monitor/linux/shell.cxx
commit f210aeacec051bf1bded690e22036d704abb4f69
Author: Dave George <de...@...>
Date: 2018-03-05T22:13:29Z
add new files.
commit b6580599619ad9aef9dcbb2303d56054134456f1
Author: Dave George <de...@...>
Date: 2018-03-06T16:08:34Z
Launch ns.
commit 4de52a77aefb2019e1e6d1ad38ec8891ef092bad
Author: Dave George <de...@...>
Date: 2018-03-06T19:25:32Z
launch nameserver without mpirun.
commit 04c1944ccc450f2b256bc61004da96347fec688e
Author: Dave George <de...@...>
Date: 2018-03-06T20:24:35Z
Fix nameserver delete.
commit 0efcb387844a24e0a113e4cb3e05ae73aeb764e1
Author: Dave George <de...@...>
Date: 2018-03-07T16:27:36Z
refactor monToNameserver interface. Create NS process (currently all nodes).
commit 54e5c79cbefcac3a592d5d4b81b2245783575a0b
Author: Dave George <de...@...>
Date: 2018-03-07T18:05:06Z
$ZNS->$NS, ns->trafns, 'nameserver info' reimplemented as 'ps {NS}'.
commit d15263075cedd78b30e37444a07b4be0687f4930
Author: Zalo Correa <za...@...>
Date: 2018-03-09T18:09:45Z
Update environment variables used to enable AGENT mode, NAME-SERVER, and associated ports.
commit 4c028ea41f4ff7f49cc4362ae99ea8a9d588a0f0
Author: Zalo Correa <za...@...>
Date: 2018-03-09T18:15:57Z
Merge branch 'TRAFODION-2884' of github.com:zcorrea/trafodion into TRAFODION-2884
commit 63d3ed1c3b0ef532193127181ff209b693358316
Author: Trina Krug <tr...@...>
Date: 2018-03-09T19:16:06Z
Framework for Monitor PTP
commit eeade17194b9e1997a53eb31fc5a3827eb4b0702
Author: Dave George <de...@...>
Date: 2018-03-09T19:26:56Z
Update.
commit 4e00a22557ba679fd6e998613d8b26ff90629d1b
Author: Dave George <de...@...>
Date: 2018-03-09T19:29:22Z
Update.
commit 64f24d2fcfccd91760d5dae65cb20ca1a4861639
Author: Zalo Correa <za...@...>
Date: 2018-03-09T19:30:16Z
Merge branch 'TRAFODION-2884' of github.com:zcorrea/trafodion into TRAFODION-2884
commit 5c608f50cfe686ec4b52646226707c800da0272b
Author: Dave George <de...@...>
Date: 2018-03-09T19:30:35Z
Update.
commit 7cc10e0a7e1811438bbcc1f571f3e42a3ebea380
Author: Dave George <de...@...>
Date: 2018-03-09T19:31:12Z
Update.
commit 1ba7f5599cc468b5727aae685d321e8c22a513e8
Author: Dave George <de...@...>
Date: 2018-03-09T19:31:49Z
Update.
commit 01bb72427c1906dca0d74088e7d64464a2236c97
Author: Dave George <de...@...>
Date: 2018-03-09T19:47:38Z
Merge branch 'TRAFODION-2884' of github.com:zcorrea/trafodion into TRAFODION-2884
Conflicts:
core/sqf/monitor/linux/pnode.h
commit 3896d9a2a6fef5ab8f694d24e7a74d00ff1e11d4
Author: Dave George <de...@...>
Date: 2018-03-09T19:48:21Z
Update NS.
commit 90b00a512da324accf7e7e902c9e95177b8cdc46
Author: Zalo Correa <za...@...>
Date: 2018-03-13T19:57:12Z
Merge branch 'TRAFODION-2884' of github.com:zcorrea/trafodion into TRAFODION-2884
----
---
[GitHub] trafodion pull request #1604: Trafodion 2884
Posted by svarnau <gi...@git.apache.org>.
Github user svarnau commented on a diff in the pull request:
https://github.com/apache/trafodion/pull/1604#discussion_r194808275
--- Diff: core/sqf/sqenvcom.sh ---
@@ -673,17 +673,31 @@ export SQ_LUNMGR_VERBOSITY=1
# Control SQ default startup behavior (c=cold, w=warm, if removed sqstart will autocheck)
export SQ_STARTUP=r
-# Monitor process creator:
+#
+# NOTE: in a Python installation when SQ_MON_RUN_MODE below
+# is AGENT the SQ_MON_CREATOR must be MPIRUN
+#
# MPIRUN - monitor process is created by mpirun
-# Uncomment SQ_MON_CREATOR when running monitor in AGENT mode
+# (meaning that mpirun is the parent process of the monitor process)
+# AGENT - monitor process runs in agent mode versus MPI collective
+#
+# Uncomment the next four environment variables
#export SQ_MON_CREATOR=MPIRUN
-
-# Monitor process run mode:
-# AGENT - monitor process runs in agent mode versus MPI collective
-# Uncomment the three environment variables below
#export SQ_MON_RUN_MODE=AGENT
-#export MONITOR_COMM_PORT=23399
-#export MONITOR_SYNC_PORT=23398
+#export MONITOR_COMM_PORT=23390
+#export MONITOR_SYNC_PORT=23380
+
+#
+# NAME-SERVER - to disable process replication and enable the name-server
+#
+# Uncomment the next environment variable
+#export SQ_NAMESERVER_ENABLED=1
+if [[ "$SQ_NAMESERVER_ENABLED" == "1" ]]; then
+ export NS_COMM_PORT=23370
+ export NS_SYNC_PORT=23360
+ export NS_M2N_COMM_PORT=23350
+ export MON2MON_COMM_PORT=23340
+fi
--- End diff --
PORT numbers should not be hard-coded here. I think most default ports are coded elsewhere, but these need to at leaset be coded to allow over-ride, such as:
export NS_COMM_PORT=${NS_COMM_PORT:-23370}
---
[GitHub] trafodion pull request #1604: Trafodion 2884
Posted by svarnau <gi...@git.apache.org>.
Github user svarnau commented on a diff in the pull request:
https://github.com/apache/trafodion/pull/1604#discussion_r195160478
--- Diff: core/sqf/sqenvcom.sh ---
@@ -673,17 +673,31 @@ export SQ_LUNMGR_VERBOSITY=1
# Control SQ default startup behavior (c=cold, w=warm, if removed sqstart will autocheck)
export SQ_STARTUP=r
-# Monitor process creator:
+#
+# NOTE: in a Python installation when SQ_MON_RUN_MODE below
+# is AGENT the SQ_MON_CREATOR must be MPIRUN
+#
# MPIRUN - monitor process is created by mpirun
-# Uncomment SQ_MON_CREATOR when running monitor in AGENT mode
+# (meaning that mpirun is the parent process of the monitor process)
+# AGENT - monitor process runs in agent mode versus MPI collective
+#
+# Uncomment the next four environment variables
#export SQ_MON_CREATOR=MPIRUN
-
-# Monitor process run mode:
-# AGENT - monitor process runs in agent mode versus MPI collective
-# Uncomment the three environment variables below
#export SQ_MON_RUN_MODE=AGENT
-#export MONITOR_COMM_PORT=23399
-#export MONITOR_SYNC_PORT=23398
+#export MONITOR_COMM_PORT=23390
+#export MONITOR_SYNC_PORT=23380
+
+#
+# NAME-SERVER - to disable process replication and enable the name-server
+#
+# Uncomment the next environment variable
+#export SQ_NAMESERVER_ENABLED=1
+if [[ "$SQ_NAMESERVER_ENABLED" == "1" ]]; then
+ export NS_COMM_PORT=23370
+ export NS_SYNC_PORT=23360
+ export NS_M2N_COMM_PORT=23350
+ export MON2MON_COMM_PORT=23340
+fi
--- End diff --
Yes
---
[GitHub] trafodion pull request #1604: Trafodion 2884
Posted by zcorrea <gi...@git.apache.org>.
Github user zcorrea commented on a diff in the pull request:
https://github.com/apache/trafodion/pull/1604#discussion_r195155067
--- Diff: core/sqf/sqenvcom.sh ---
@@ -673,17 +673,31 @@ export SQ_LUNMGR_VERBOSITY=1
# Control SQ default startup behavior (c=cold, w=warm, if removed sqstart will autocheck)
export SQ_STARTUP=r
-# Monitor process creator:
+#
+# NOTE: in a Python installation when SQ_MON_RUN_MODE below
+# is AGENT the SQ_MON_CREATOR must be MPIRUN
+#
# MPIRUN - monitor process is created by mpirun
-# Uncomment SQ_MON_CREATOR when running monitor in AGENT mode
+# (meaning that mpirun is the parent process of the monitor process)
+# AGENT - monitor process runs in agent mode versus MPI collective
+#
+# Uncomment the next four environment variables
#export SQ_MON_CREATOR=MPIRUN
-
-# Monitor process run mode:
-# AGENT - monitor process runs in agent mode versus MPI collective
-# Uncomment the three environment variables below
#export SQ_MON_RUN_MODE=AGENT
-#export MONITOR_COMM_PORT=23399
-#export MONITOR_SYNC_PORT=23398
+#export MONITOR_COMM_PORT=23390
+#export MONITOR_SYNC_PORT=23380
+
+#
+# NAME-SERVER - to disable process replication and enable the name-server
+#
+# Uncomment the next environment variable
+#export SQ_NAMESERVER_ENABLED=1
+if [[ "$SQ_NAMESERVER_ENABLED" == "1" ]]; then
+ export NS_COMM_PORT=23370
+ export NS_SYNC_PORT=23360
+ export NS_M2N_COMM_PORT=23350
+ export MON2MON_COMM_PORT=23340
+fi
--- End diff --
Is the '-' part of the syntax?
---
[GitHub] trafodion pull request #1604: Trafodion 2884
Posted by zcorrea <gi...@git.apache.org>.
Github user zcorrea commented on a diff in the pull request:
https://github.com/apache/trafodion/pull/1604#discussion_r195174647
--- Diff: core/sqf/sqenvcom.sh ---
@@ -673,17 +673,31 @@ export SQ_LUNMGR_VERBOSITY=1
# Control SQ default startup behavior (c=cold, w=warm, if removed sqstart will autocheck)
export SQ_STARTUP=r
-# Monitor process creator:
+#
+# NOTE: in a Python installation when SQ_MON_RUN_MODE below
+# is AGENT the SQ_MON_CREATOR must be MPIRUN
+#
# MPIRUN - monitor process is created by mpirun
-# Uncomment SQ_MON_CREATOR when running monitor in AGENT mode
+# (meaning that mpirun is the parent process of the monitor process)
+# AGENT - monitor process runs in agent mode versus MPI collective
+#
+# Uncomment the next four environment variables
#export SQ_MON_CREATOR=MPIRUN
-
-# Monitor process run mode:
-# AGENT - monitor process runs in agent mode versus MPI collective
-# Uncomment the three environment variables below
#export SQ_MON_RUN_MODE=AGENT
-#export MONITOR_COMM_PORT=23399
-#export MONITOR_SYNC_PORT=23398
+#export MONITOR_COMM_PORT=23390
+#export MONITOR_SYNC_PORT=23380
+
+#
+# NAME-SERVER - to disable process replication and enable the name-server
+#
+# Uncomment the next environment variable
+#export SQ_NAMESERVER_ENABLED=1
+if [[ "$SQ_NAMESERVER_ENABLED" == "1" ]]; then
+ export NS_COMM_PORT=23370
+ export NS_SYNC_PORT=23360
+ export NS_M2N_COMM_PORT=23350
+ export MON2MON_COMM_PORT=23340
+fi
--- End diff --
I'll fix this. Thanks!
---
[GitHub] trafodion pull request #1604: Trafodion 2884
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/trafodion/pull/1604
---