You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/04/07 22:57:32 UTC
svn commit: r1738190 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper:
DatabaseHelper.java JmxHelper.java
Author: degenaro
Date: Thu Apr 7 20:57:32 2016
New Revision: 1738190
URL: http://svn.apache.org/viewvc?rev=1738190&view=rev
Log:
UIMA-4732 DUCC Web Server (WS) broker and database are shown as down on Daemons page
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java (with props)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java?rev=1738190&r1=1738189&r2=1738190&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java Thu Apr 7 20:57:32 2016
@@ -20,16 +20,13 @@ package org.apache.uima.ducc.ws.helper;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
-public class DatabaseHelper {
+public class DatabaseHelper extends JmxHelper {
private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DatabaseHelper.class.getName());
private static DuccId jobid = null;
@@ -42,13 +39,6 @@ public class DatabaseHelper {
protected boolean enabled = false;
protected String host = null;
- protected String jmxHost = "localhost";
- protected int jmxPort = 7199;
- protected String jmxUrl = null;
-
- private JMXServiceURL url;
- private JMXConnector jmxc;
- private MBeanServerConnection mbsc;
private DatabaseHelper() {
init();
@@ -75,6 +65,7 @@ public class DatabaseHelper {
logger.error(location, jobid, e);
}
}
+ setJmxPort(7199); // default
value = dpr.getProperty(DuccPropertiesResolver.ducc_database_jmx_port);
if(value != null) {
try {
@@ -86,15 +77,19 @@ public class DatabaseHelper {
}
value = "service:jmx:rmi:///jndi/rmi://"+getJmxHost()+":"+getJmxPort()+"/jmxrmi";
setJmxUrl(value);
- url = new JMXServiceURL(getJmxUrl());
- jmxc = JMXConnectorFactory.connect(url, null);
- mbsc = jmxc.getMBeanServerConnection();
+ jmxConnect();
}
catch(Exception e) {
logger.error(location, jobid, e);
}
}
+ private void reconnect() {
+ String location = "reconnect";
+ init();
+ logger.debug(location, jobid, "reconnected");
+ }
+
public boolean isEnabled() {
return enabled;
}
@@ -111,30 +106,6 @@ public class DatabaseHelper {
return host;
}
- private void setJmxHost(String value) {
- jmxHost = value;
- }
-
- public String getJmxHost() {
- return jmxHost;
- }
-
- private void setJmxPort(int value) {
- jmxPort = value;
- }
-
- public int getJmxPort() {
- return jmxPort;
- }
-
- private void setJmxUrl(String value) {
- jmxUrl = value;
- }
-
- public String getJmxUrl() {
- return jmxUrl;
- }
-
// Runtime Info //
public boolean isAlive() {
@@ -148,22 +119,48 @@ public class DatabaseHelper {
public Long getStartTime() {
String location = "getStartTime";
Long retVal = new Long(0);
+ Object o = null;
+ MBeanServerConnection mbsc = null;
try {
- Object o = mbsc.getAttribute(new ObjectName("java.lang:type=Runtime"), "StartTime");
+ mbsc = getMBSC();
+ o = mbsc.getAttribute(new ObjectName("java.lang:type=Runtime"), "StartTime");
retVal = (Long) o;
}
catch(Exception e) {
- logger.error(location, jobid, e);
+ try {
+ reconnect();
+ mbsc = getMBSC();
+ o = mbsc.getAttribute(new ObjectName("java.lang:type=Runtime"), "StartTime");
+ retVal = (Long) o;
+ }
+ catch(Exception e2) {
+ logger.error(location, jobid, e2);
+ }
}
return retVal;
}
+ private String getJmxData() throws Exception {
+ Object o = null;
+ MBeanServerConnection mbsc = null;
+ try {
+ mbsc = getMBSC();
+ o = mbsc.getAttribute(new ObjectName("java.lang:type=Runtime"), "Name");
+ }
+ catch(Exception e) {
+ reconnect();
+ mbsc = getMBSC();
+ o = mbsc.getAttribute(new ObjectName("java.lang:type=Runtime"), "Name");
+ }
+ String data = (String) o;
+ return data;
+ }
+
public Long getPID() {
String location = "getPID";
Long retVal = new Long(0);
try {
- Object o = mbsc.getAttribute(new ObjectName("java.lang:type=Runtime"), "Name");
- String data = (String) o;
+ String data = getJmxData();
String[] address = data.split("@");
Long pid = Long.parseLong(address[0]);
retVal = pid;
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java?rev=1738190&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java Thu Apr 7 20:57:32 2016
@@ -0,0 +1,72 @@
+/*
+ * 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.uima.ducc.ws.helper;
+
+import java.io.IOException;
+
+import javax.management.MBeanServerConnection;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+public class JmxHelper {
+
+ private String jmxHost = "localhost";
+ private int jmxPort = -1;
+ private String jmxUrl = null;
+
+ private JMXServiceURL url;
+ private JMXConnector jmxc;
+ private MBeanServerConnection mbsc;
+
+ protected void setJmxHost(String value) {
+ jmxHost = value;
+ }
+
+ public String getJmxHost() {
+ return jmxHost;
+ }
+
+ protected void setJmxPort(int value) {
+ jmxPort = value;
+ }
+
+ public int getJmxPort() {
+ return jmxPort;
+ }
+
+ protected void setJmxUrl(String value) {
+ jmxUrl = value;
+ }
+
+ public String getJmxUrl() {
+ return jmxUrl;
+ }
+
+ public MBeanServerConnection getMBSC() {
+ return mbsc;
+ }
+
+ protected void jmxConnect() throws IOException {
+ url = new JMXServiceURL(getJmxUrl());
+ jmxc = JMXConnectorFactory.connect(url, null);
+ mbsc = jmxc.getMBeanServerConnection();
+ }
+
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain