[GitHub] maskit commented on a change in pull request #1241: Add REST api to check host-status for adding/removing from vip
maskit commented on a change in pull request #1241: Add REST api to check
host-status for adding/removing from vip
URL: https://github.com/apache/incubator-pulsar/pull/1241#discussion_r168716845
##
File path:
pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/admin/VipStatus.java
##
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.proxy.server.admin;
+
+import java.io.File;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response.Status;
+
+/**
+ * Web resource used by the VIP service to check to availability of the proxy
instance.
+ */
+@Path("/status.html")
+public class VipStatus extends ProxyWebResource {
+
+@GET
+@Context
+public String checkStatus() {
+String statusFilePath =
service().getConfiguration().getStatusFilePath();
+
+File statusFile = new File(statusFilePath);
+if (statusFile.exists()) {
+return "OK";
+} else {
+throw new WebApplicationException(Status.NOT_FOUND);
Review comment:
Is it possible to return 404 without generating an exception? Or do you want
to generate an exception for some reasons?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] maskit commented on a change in pull request #1241: Add REST api to check host-status for adding/removing from vip
maskit commented on a change in pull request #1241: Add REST api to check
host-status for adding/removing from vip
URL: https://github.com/apache/incubator-pulsar/pull/1241#discussion_r168716998
##
File path:
pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/admin/VipStatus.java
##
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.proxy.server.admin;
+
+import java.io.File;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response.Status;
+
+/**
+ * Web resource used by the VIP service to check to availability of the proxy
instance.
+ */
+@Path("/status.html")
+public class VipStatus extends ProxyWebResource {
+
+@GET
+@Context
+public String checkStatus() {
+String statusFilePath =
service().getConfiguration().getStatusFilePath();
+
+File statusFile = new File(statusFilePath);
+if (statusFile.exists()) {
Review comment:
nitpick: It might be a directory.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] maskit commented on a change in pull request #1241: Add REST api to check host-status for adding/removing from vip
maskit commented on a change in pull request #1241: Add REST api to check
host-status for adding/removing from vip
URL: https://github.com/apache/incubator-pulsar/pull/1241#discussion_r168717832
##
File path:
pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/VipStatus.java
##
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.websocket.admin;
+
+import java.io.File;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response.Status;
+
+/**
+ * Web resource used by the VIP service to check to availability of the
web-socket proxy instance.
+ */
+@Path("/status.html")
+public class VipStatus extends WebSocketWebResource {
Review comment:
Yikes! New duplicate code.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] maskit commented on a change in pull request #1241: Add REST api to check host-status for adding/removing from vip
maskit commented on a change in pull request #1241: Add REST api to check
host-status for adding/removing from vip
URL: https://github.com/apache/incubator-pulsar/pull/1241#discussion_r168917344
##
File path:
pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
##
@@ -96,28 +97,30 @@ public ProxyServiceStarter(String[] args) throws Exception
{
java.security.Security.addProvider(new
org.bouncycastle.jce.provider.BouncyCastleProvider());
-// create broker service
-ProxyService discoveryService = new ProxyService(config);
+// create proxy service
+ProxyService proxyService = new ProxyService(config);
// create a web-service
final WebServer server = new WebServer(config);
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
try {
-discoveryService.close();
+proxyService.close();
server.stop();
} catch (Exception e) {
log.warn("server couldn't stop gracefully {}",
e.getMessage(), e);
}
}
});
-discoveryService.start();
+proxyService.start();
// Setup metrics
DefaultExports.initialize();
server.addServlet("/metrics", new ServletHolder(MetricsServlet.class));
+server.addRestResources("/admin",
VipStatus.class.getPackage().getName(),
Review comment:
`addRestResources("/", ` ?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] maskit commented on a change in pull request #1241: Add REST api to check host-status for adding/removing from vip
maskit commented on a change in pull request #1241: Add REST api to check
host-status for adding/removing from vip
URL: https://github.com/apache/incubator-pulsar/pull/1241#discussion_r168917480
##
File path:
pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/admin/VipStatus.java
##
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.proxy.server.admin;
+
+import java.io.File;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response.Status;
+
+/**
+ * Web resource used by the VIP service to check to availability of the proxy
instance.
+ */
+@Path("/status.html")
+public class VipStatus extends ProxyWebResource {
+
+@GET
+@Context
+public String checkStatus() {
+String statusFilePath =
service().getConfiguration().getStatusFilePath();
+
+File statusFile = new File(statusFilePath);
+if (statusFile.exists()) {
+return "OK";
+} else {
+throw new WebApplicationException(Status.NOT_FOUND);
Review comment:
OK, we shouldn't "break" the pattern. Let's keep it for now.
It seems that there is a mechanism called `ExceptionMapper` and it sets
status code during exception handling, it sounds like too costly for
status.html though.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] maskit commented on a change in pull request #1241: Add REST api to check host-status for adding/removing from vip
maskit commented on a change in pull request #1241: Add REST api to check
host-status for adding/removing from vip
URL: https://github.com/apache/incubator-pulsar/pull/1241#discussion_r168917531
##
File path:
pulsar-websocket/src/main/java/org/apache/pulsar/websocket/admin/VipStatus.java
##
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.websocket.admin;
+
+import java.io.File;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response.Status;
+
+/**
+ * Web resource used by the VIP service to check to availability of the
web-socket proxy instance.
+ */
+@Path("/status.html")
+public class VipStatus extends WebSocketWebResource {
Review comment:
Thank you so much!
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
