You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2016/01/30 01:09:45 UTC
[1/3] incubator-trafodion git commit: Add DCSMaster status to sqcheck
json output
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 4c192b865 -> 77581c107
Add DCSMaster status to sqcheck json output
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6182ef30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6182ef30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6182ef30
Branch: refs/heads/master
Commit: 6182ef302bea701e7d0c3c922f9e913585250fe7
Parents: 1741235
Author: Venkat Muthuswamy <ve...@esgyn.com>
Authored: Fri Jan 29 11:00:10 2016 -0800
Committer: Venkat Muthuswamy <ve...@esgyn.com>
Committed: Fri Jan 29 11:00:10 2016 -0800
----------------------------------------------------------------------
core/sqf/sql/scripts/sqcheck | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6182ef30/core/sqf/sql/scripts/sqcheck
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/sqcheck b/core/sqf/sql/scripts/sqcheck
index 6edcf1f..6aaf0c0 100755
--- a/core/sqf/sql/scripts/sqcheck
+++ b/core/sqf/sql/scripts/sqcheck
@@ -504,7 +504,8 @@ if [ $json_output '==' 1 ]; then
json_dtm=""\""PROCESS"\"":"\""DTM"\"","\""CONFIGURED"\"":$cfg_dtm_cnt,"\""ACTUAL"\"":$act_dtm_cnt,"\""DOWN"\"":\"${down_dtms[*]}\""
json_rms=""\""PROCESS"\"":"\""RMS"\"","\""CONFIGURED"\"":$cfg_rms_cnt,"\""ACTUAL"\"":$act_rms_cnt,"\""DOWN"\"":\"${down_rms[*]}\""
json_mxosrvr=""\""PROCESS"\"":"\""MXOSRVR"\"","\""CONFIGURED"\"":$cfg_mxo_cnt,"\""ACTUAL"\"":$act_mxo_cnt,"\""DOWN"\"":\"${act_mxo_down_cnt}\""
- echo "[{$json_dtm},{$json_rms},{$json_mxosrvr}]"
+ json_dcsmaster=""\""PROCESS"\"":"\""DCSMASTER"\"","\""CONFIGURED"\"":$cfg_dcsmaster_cnt,"\""ACTUAL"\"":$actual_dcsmaster_cnt,"\""DOWN"\"":\"${down_dcsmaster_cnt}\""
+ echo "[{$json_dtm},{$json_rms},{$json_dcsmaster},{$json_mxosrvr}]"
elif [[ $sqck_component == "dtm" ]]; then
json_dtm=""\""PROCESS"\"":"\""DTM"\"","\""CONFIGURED"\"":$cfg_dtm_cnt,"\""ACTUAL"\"":$act_dtm_cnt,"\""DOWN"\"":\"${down_dtms[*]}\""
echo "[{$json_dtm}]"
@@ -513,7 +514,8 @@ if [ $json_output '==' 1 ]; then
echo "[{$json_rms}]"
elif [[ $sqck_component == "dcs" ]]; then
json_mxosrvr=""\""PROCESS"\"":"\""MXOSRVR"\"","\""CONFIGURED"\"":$cfg_mxo_cnt,"\""ACTUAL"\"":$act_mxo_cnt,"\""DOWN"\"":\"${act_mxo_down_cnt}\""
- echo "[{$json_mxosrvr}]"
+ json_dcsmaster=""\""PROCESS"\"":"\""DCSMASTER"\"","\""CONFIGURED"\"":$cfg_dcsmaster_cnt,"\""ACTUAL"\"":$actual_dcsmaster_cnt,"\""DOWN"\"":\"${down_dcsmaster_cnt}\""
+ echo "[{$json_dcsmaster},{$json_mxosrvr}]"
fi
else
echo
[2/3] incubator-trafodion git commit: Update REST documentation with
change in server status output
Posted by ar...@apache.org.
Update REST documentation with change in server status output
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d88ffc10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d88ffc10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d88ffc10
Branch: refs/heads/master
Commit: d88ffc105060c7d470f2bee160d6768d02cc5b63
Parents: 6182ef3
Author: Venkat Muthuswamy <ve...@esgyn.com>
Authored: Fri Jan 29 11:38:03 2016 -0800
Committer: Venkat Muthuswamy <ve...@esgyn.com>
Committed: Fri Jan 29 11:38:03 2016 -0800
----------------------------------------------------------------------
core/rest/src/main/asciidoc/_chapters/apis.adoc | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d88ffc10/core/rest/src/main/asciidoc/_chapters/apis.adoc
----------------------------------------------------------------------
diff --git a/core/rest/src/main/asciidoc/_chapters/apis.adoc b/core/rest/src/main/asciidoc/_chapters/apis.adoc
index 45cb7ec..4ffb612 100644
--- a/core/rest/src/main/asciidoc/_chapters/apis.adoc
+++ b/core/rest/src/main/asciidoc/_chapters/apis.adoc
@@ -111,6 +111,12 @@ Response Body:
"DOWN":""
},
{
+ "PROCESS":"DCSMASTER",
+ "CONFIGURED":2,
+ "ACTUAL":2,
+ "DOWN":""
+ },
+ {
"PROCESS":"MXOSRVR",
"CONFIGURED":4,
"ACTUAL":4,
@@ -181,6 +187,12 @@ curl -X GET -H "Accept: application/json" http://{hostname}:4200/v1/servers/
"ACTUAL":4,"DOWN":""
},
{
+ "PROCESS":"DCSMASTER",
+ "CONFIGURED":2,
+ "ACTUAL":2,
+ "DOWN":""
+ },
+ {
"PROCESS":"MXOSRVR",
"CONFIGURED":4,
"ACTUAL":0,
@@ -241,7 +253,7 @@ curl -X GET -H "Accept: application/json" http://{hostname}:4200/v1/servers/rms
}
----
-In this example the user wishes to know the status of Trafodion DCS.
+In this example the user wishes to know the status of Trafodion DCS components.
This a jsonized version of the _sqcheck -c dcs_ command.
.Http command
@@ -257,6 +269,12 @@ curl -X GET -H "Accept: application/json" http://{hostname}:4200/v1/servers/dcs
"PROCESSES":
[
{
+ "PROCESS":"DCSMASTER",
+ "CONFIGURED":2,
+ "ACTUAL":2,
+ "DOWN":""
+ },
+ {
"PROCESS":"MXOSRVR",
"CONFIGURED":4,
"ACTUAL":4,
[3/3] incubator-trafodion git commit: Merge
[TRAFODION-TRAFODION-1785] PR-295 Add DCSMaster status to sqcheck json output
Posted by ar...@apache.org.
Merge [TRAFODION-TRAFODION-1785] PR-295 Add DCSMaster status to sqcheck json output
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/77581c10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/77581c10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/77581c10
Branch: refs/heads/master
Commit: 77581c107ea4b8dc650e7c4c130c9a94607e66f5
Parents: 4c192b8 d88ffc1
Author: Arvind Narain <ar...@apache.org>
Authored: Sat Jan 30 00:08:04 2016 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Sat Jan 30 00:08:04 2016 +0000
----------------------------------------------------------------------
core/rest/src/main/asciidoc/_chapters/apis.adoc | 20 +++++++++++++++++++-
core/sqf/sql/scripts/sqcheck | 6 ++++--
2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------