Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Michael Blow (Code Review)]

Michael Blow has submitted this change and it was merged.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Output From ShutdownAPIServlet; status 405 on GET

Change-Id: I3f1a7d707ebdcb2a6502bc06d35d7ed38121e472
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1136
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
Integration-Tests: Jenkins 
Reviewed-by: Till Westmann 
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
1 file changed, 22 insertions(+), 10 deletions(-)

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



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 6d8c444..dd2f799 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
@@ -19,6 +19,8 @@
 package org.apache.asterix.api.http.servlet;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
 import java.util.logging.Level;
 
 import javax.servlet.ServletContext;
@@ -28,7 +30,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.asterix.common.config.GlobalConfig;
+import org.apache.asterix.om.util.AsterixClusterProperties;
 import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.json.JSONObject;
 
 import static 
org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR;
 
@@ -39,23 +43,31 @@
 protected void doPost(HttpServletRequest request, HttpServletResponse 
response)
 throws ServletException, IOException {
 
-response.setContentType("application/json");
-response.setCharacterEncoding("utf-8");
-
 ServletContext context = getServletContext();
 IHyracksClientConnection hcc = (IHyracksClientConnection) 
context.getAttribute(HYRACKS_CONNECTION_ATTR);
 Thread t = new Thread(() -> {
 try {
 hcc.stopCluster();
 } catch (Exception e) {
-GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, e.getMessage(), 
e);
+GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, "Exception 
stopping cluster", e);
 }
-});
-t.start();
-response.setStatus(HttpServletResponse.SC_ACCEPTED);
-}
+}, "Shutdown Servlet Worker");
 
-@Override
-public void doGet(HttpServletRequest request, HttpServletResponse 
response) throws IOException {
+response.setContentType("application/json");
+response.setCharacterEncoding("utf-8");
+response.setStatus(HttpServletResponse.SC_ACCEPTED);
+JSONObject jsonObject = new JSONObject();
+try {
+jsonObject.put("status", "SHUTTING_DOWN");
+jsonObject.put("date", new Date());
+jsonObject.put("cluster" , 
AsterixClusterProperties.INSTANCE.getClusterStateDescription());
+
+final PrintWriter writer = response.getWriter();
+writer.print(jsonObject.toString(4));
+writer.close();
+} catch (Exception e) {
+GlobalConfig.ASTERIX_LOGGER.log(Level.INFO, "Exception writing 
response", e);
+}
+t.start();
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3f1a7d707ebdcb2a6502bc06d35d7ed38121e472
Gerrit-PatchSet: 2
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]: Output From ShutdownAPIServlet; status 405 on GET

[Till Westmann (Code Review)]

Till Westmann has posted comments on this change.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Patch Set 1: Code-Review+2

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

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

Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Patch Set 1: Integration-Tests+1

Integration Tests Successful

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

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

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

Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Patch Set 1:

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

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

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

Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Till Westmann (Code Review)]

Till Westmann has posted comments on this change.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Patch Set 1:

TRIGGER asterix-gerrit-integration-tests

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

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

Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Patch Set 1: Integration-Tests-1

Integration Tests Timed Out

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/531/ : 
ABORTED

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

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

Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Patch Set 1:

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

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

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

Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Jenkins (Code Review)]

Jenkins has posted comments on this change.

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..


Patch Set 1:

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

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

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

Change in asterixdb[master]: Output From ShutdownAPIServlet; status 405 on GET

[Michael Blow (Code Review)]

Michael Blow has uploaded a new change for review.

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

Change subject: Output From ShutdownAPIServlet; status 405 on GET
..

Output From ShutdownAPIServlet; status 405 on GET

Change-Id: I3f1a7d707ebdcb2a6502bc06d35d7ed38121e472
---
M 
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ShutdownAPIServlet.java
1 file changed, 22 insertions(+), 10 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/36/1136/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 6d8c444..dd2f799 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
@@ -19,6 +19,8 @@
 package org.apache.asterix.api.http.servlet;
 
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
 import java.util.logging.Level;
 
 import javax.servlet.ServletContext;
@@ -28,7 +30,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.asterix.common.config.GlobalConfig;
+import org.apache.asterix.om.util.AsterixClusterProperties;
 import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.json.JSONObject;
 
 import static 
org.apache.asterix.api.http.servlet.ServletConstants.HYRACKS_CONNECTION_ATTR;
 
@@ -39,23 +43,31 @@
 protected void doPost(HttpServletRequest request, HttpServletResponse 
response)
 throws ServletException, IOException {
 
-response.setContentType("application/json");
-response.setCharacterEncoding("utf-8");
-
 ServletContext context = getServletContext();
 IHyracksClientConnection hcc = (IHyracksClientConnection) 
context.getAttribute(HYRACKS_CONNECTION_ATTR);
 Thread t = new Thread(() -> {
 try {
 hcc.stopCluster();
 } catch (Exception e) {
-GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, e.getMessage(), 
e);
+GlobalConfig.ASTERIX_LOGGER.log(Level.SEVERE, "Exception 
stopping cluster", e);
 }
-});
-t.start();
-response.setStatus(HttpServletResponse.SC_ACCEPTED);
-}
+}, "Shutdown Servlet Worker");
 
-@Override
-public void doGet(HttpServletRequest request, HttpServletResponse 
response) throws IOException {
+response.setContentType("application/json");
+response.setCharacterEncoding("utf-8");
+response.setStatus(HttpServletResponse.SC_ACCEPTED);
+JSONObject jsonObject = new JSONObject();
+try {
+jsonObject.put("status", "SHUTTING_DOWN");
+jsonObject.put("date", new Date());
+jsonObject.put("cluster" , 
AsterixClusterProperties.INSTANCE.getClusterStateDescription());
+
+final PrintWriter writer = response.getWriter();
+writer.print(jsonObject.toString(4));
+writer.close();
+} catch (Exception e) {
+GlobalConfig.ASTERIX_LOGGER.log(Level.INFO, "Exception writing 
response", e);
+}
+t.start();
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f1a7d707ebdcb2a6502bc06d35d7ed38121e472
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow