Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Michael Blow has submitted this change and it was merged.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


HTTP API++, NCService Termination After Dead NCService

- include PID of NC service in NC config API
- shutdown NCService even when NC is unresponsive (e.g. dead) when
  shutdown?all=true
- include PIDs of NC service & NC in shutdown response document
- interrogate cluster state from client helper
- advertise shutdown, version cluster HTTP APIs
- fix possible bad return code from stop-sample-cluster in case of very
  fast CCDriver exit
- cleanup transposed JUnit assert args in SampleLocalClusterIT

Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1193
Tested-by: Jenkins 
Reviewed-by: Till Westmann 
Integration-Tests: Jenkins 
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_3/cluster_state_3.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_4/cluster_state_4.1.adm
M asterixdb/asterix-client-helper/pom.xml
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/GetClusterStateCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/WaitForClusterCommand.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh
M 
asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java
24 files changed, 429 insertions(+), 180 deletions(-)

Approvals:
  Till Westmann: Looks good to me, approved
  Jenkins: Verified; Verified

Objections:
  Jenkins: Violations found



diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
index 0d9ff16..7e7b068 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -44,6 +45,10 @@
 public static final String CONFIG_URI_KEY = "configUri";
 public static final String STATS_URI_KEY = "statsUri";
 public static final String THREAD_DUMP_URI_KEY = "threadDumpUri";
+public static final String SHUTDOWN_URI_KEY = "shutdownUri";
+public static final String FULL_SHUTDOWN_URI_KEY = "fullShutdownUri";
+public static final String VERSION_URI_KEY = "versionUri";
+public static final Pattern PARENT_DIR = 
Pattern.compile("/[^./]+/\\.\\./");
 
 @Override
 public 

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/750/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/750/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

Integration Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/748/ : 
UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/748/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Till Westmann (Code Review)]

Till Westmann has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6: Code-Review+2

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/745/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Michael Blow has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

TRIGGER: asterix-gerrit-integration-tests

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6: Integration-Tests-1

Integration Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/744/ : 
UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/744/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 6:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2790/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Hello Till Westmann, Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1193

to look at the new patch set (#6).

Change subject: HTTP API++, NCService Termination After Dead NCService
..

HTTP API++, NCService Termination After Dead NCService

- include PID of NC service in NC config API
- shutdown NCService even when NC is unresponsive (e.g. dead) when
  shutdown?all=true
- include PIDs of NC service & NC in shutdown response document
- interrogate cluster state from client helper
- advertise shutdown, version cluster HTTP APIs
- fix possible bad return code from stop-sample-cluster in case of very
  fast CCDriver exit
- cleanup transposed JUnit assert args in SampleLocalClusterIT

Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_3/cluster_state_3.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_4/cluster_state_4.1.adm
M asterixdb/asterix-client-helper/pom.xml
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/GetClusterStateCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/WaitForClusterCommand.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh
M 
asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java
24 files changed, 429 insertions(+), 180 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/93/1193/6
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 6
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Michael Blow 
Gerrit-Reviewer: Till Westmann 

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Till Westmann (Code Review)]

Till Westmann has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 5: Code-Review+2

(2 comments)

Looks good. Just one question in 2 places, but it seems like a corner case that 
we don't need to address right now.

https://asterix-gerrit.ics.uci.edu/#/c/1193/5/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
File 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java:

Line 77: nc.put(NCSERVICE_PID, 
details.getJSONObject(INI).getInt(NCSERVICE_PID));
When running with the integration util, I get an ncservice_pid of 0. Should we 
choose another default? (Seems that we shouldn't put a lot of effort into 
creating special cases for the integration util, so "no" sounds like a good 
default answer ...)


https://asterix-gerrit.ics.uci.edu/#/c/1193/5/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
File 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java:

Line 264: if (ncservicePid != 0) {
For some reason I'm getting a '0' ncservice-pid in the integration util.


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: Yes

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 5: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/739/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 5:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 5:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2783/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Hello Till Westmann, Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1193

to look at the new patch set (#5).

Change subject: HTTP API++, NCService Termination After Dead NCService
..

HTTP API++, NCService Termination After Dead NCService

- include PID of NC service in NC config API
- shutdown NCService even when NC is unresponsive (e.g. dead) when
  shutdown?all=true
- include PIDs of NC service & NC in shutdown response document
- interrogate cluster state from client helper
- advertise shutdown, version cluster HTTP APIs
- fix possible bad return code from stop-sample-cluster in case of very
  fast CCDriver exit
- cleanup transposed JUnit assert args in SampleLocalClusterIT

Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_3/cluster_state_3.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_4/cluster_state_4.1.adm
M asterixdb/asterix-client-helper/pom.xml
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/GetClusterStateCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/WaitForClusterCommand.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh
M 
asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java
24 files changed, 429 insertions(+), 180 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/93/1193/5
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 5
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Till Westmann (Code Review)]

Till Westmann has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 4: Code-Review+1

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1193/4//COMMIT_MSG
Commit Message:

Line 16:   fast CCDriver exti
s/exti/exit/


-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: Yes

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 4: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/734/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 4:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/734/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 4:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 4:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2776/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1193

to look at the new patch set (#4).

Change subject: HTTP API++, NCService Termination After Dead NCService
..

HTTP API++, NCService Termination After Dead NCService

- include PID of NC service in NC config API
- shutdown NCService even when NC is unresponsive (e.g. dead) when
  shutdown?all=true
- include PIDs of NC service & NC in shutdown response document
- interrogate cluster state from client helper
- advertise shutdown, version cluster HTTP APIs
- fix possible bad return code from stop-sample-cluster in case of very
  fast CCDriver exti
- cleanup transposed JUnit assert args in SampleLocalClusterIT

Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_3/cluster_state_3.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_4/cluster_state_4.1.adm
M asterixdb/asterix-client-helper/pom.xml
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/GetClusterStateCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/WaitForClusterCommand.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh
M 
asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java
24 files changed, 429 insertions(+), 180 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/93/1193/4
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 4
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 3: Integration-Tests-1

Integration Tests Failed

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/725/ : 
UNSTABLE

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 3:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/725/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 3:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1193

to look at the new patch set (#3).

Change subject: HTTP API++, NCService Termination After Dead NCService
..

HTTP API++, NCService Termination After Dead NCService

- include PID of NC service in NC config API
- shutdown NCService even when NC is unresponsive (e.g. dead) when
  shutdown?all=true
- include PIDs of NC service & NC in shutdown response document
- interrogate cluster state from client helper
- advertise shutdown, version cluster HTTP APIs

Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ClusterAPIServlet.java
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_3/cluster_state_3.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_4/cluster_state_4.1.adm
M asterixdb/asterix-client-helper/pom.xml
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/ClientCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/GetClusterStateCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/RemoteCommand.java
M 
asterixdb/asterix-client-helper/src/main/java/org/apache/asterix/clienthelper/commands/WaitForClusterCommand.java
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/start-sample-cluster.sh
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.bat
M asterixdb/asterix-server/src/main/samples/local/bin/stop-sample-cluster.sh
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java
23 files changed, 425 insertions(+), 176 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/93/1193/3
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 3:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2767/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 3
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 2: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/693/ : 
SUCCESS

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 2:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/693/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Till Westmann 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 2:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 2:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2719/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Hello Jenkins,

I'd like you to reexamine a change.  Please visit

https://asterix-gerrit.ics.uci.edu/1193

to look at the new patch set (#2).

Change subject: HTTP API++, NCService Termination After Dead NCService
..

HTTP API++, NCService Termination After Dead NCService

- include PID of NC service in NC config API
- shutdown NCService even when NC is unresponsive (e.g. dead) when
  shutdown?all=true
- include PIDs of NC service & NC in shutdown response document

Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_3/cluster_state_3.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_4/cluster_state_4.1.adm
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ShutdownNCServiceWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
A 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/ServiceConstants.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java
13 files changed, 293 insertions(+), 114 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/93/1193/2
-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 1:

WARNING: THIS CHANGE CONTAINS CROSS-PRODUCT CHANGES IN:
* asterixdb
* hyracks-fullstack

PLEASE REVIEW CAREFULLY AND LOOK FOR API CHANGES!

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: HTTP API++, NCService Termination After Dead NCService
..


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/2718/

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1193
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

Change in asterixdb[master]: HTTP API++, NCService Termination After Dead NCService

[Michael Blow (Code Review)]

Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1193

Change subject: HTTP API++, NCService Termination After Dead NCService
..

HTTP API++, NCService Termination After Dead NCService

- include PID of NC service in NC config API
- shutdown NCService even when NC is unresponsive (e.g. dead) when
  shutdown?all=true
- include PIDs of NC service & NC in shutdown response document

Change-Id: Ia48eb16696e48444f610fd5e8d7d4666d0257a38
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_3/cluster_state_3.1.adm
M 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_4/cluster_state_4.1.adm
M 
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/util/ClusterStateManager.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/ClusterShutdownWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/TriggerNCWork.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/controllers/NCConfig.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/shutdown/ShutdownRun.java
M 
hyracks-fullstack/hyracks/hyracks-control/hyracks-nc-service/src/main/java/org/apache/hyracks/control/nc/service/NCService.java
11 files changed, 205 insertions(+), 114 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/93/1193/1

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
index d8cb553..d99b379 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
@@ -34,10 +34,15 @@
 import org.apache.asterix.common.config.GlobalConfig;
 import org.apache.asterix.runtime.util.ClusterStateManager;
 import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 public class ShutdownAPIServlet extends HttpServlet {
 private static final long serialVersionUID = 1L;
+public static final String NODE_ID_KEY = "node_id";
+public static final String NCSERVICE_PID = "ncservice_pid";
+public static final String INI = "ini";
+public static final String PID = "pid";
 
 @Override
 protected void doPost(HttpServletRequest request, HttpServletResponse 
response)
@@ -61,7 +66,18 @@
 try {
 jsonObject.put("status", "SHUTTING_DOWN");
 jsonObject.put("date", new Date());
-jsonObject.put("cluster", 
ClusterStateManager.INSTANCE.getClusterStateDescription());
+JSONObject clusterState = 
ClusterStateManager.INSTANCE.getClusterStateDescription();
+JSONArray ncs = clusterState.getJSONArray("ncs");
+for (int i = 0; i < ncs.length(); i++) {
+JSONObject nc = ncs.getJSONObject(i);
+String node = nc.getString(NODE_ID_KEY);
+JSONObject details = new 
JSONObject(hcc.getNodeDetailsJSON(node, false, true));
+nc.put(PID, details.get(PID));
+if (details.has(INI) && 
details.getJSONObject(INI).has(NCSERVICE_PID)) {
+nc.put(NCSERVICE_PID, 
details.getJSONObject(INI).getInt(NCSERVICE_PID));
+}
+}
+jsonObject.put("cluster", clusterState);
 
 final PrintWriter writer = response.getWriter();
 writer.print(jsonObject.toString(4));
diff --git 
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
 
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
index 8b66885..30e6886 100644
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.adm
@@ -60,9 +60,16 @@
 "configUri": 
"http://127.0.0.1:19002/admin/cluster/node/asterix_nc1/config;,
 "node_id": "asterix_nc1",
 "partitions": [
-"partition_0",
-"partition_1"
+{
+