Merge pull request #10 from uavorg/master

merge from master
uavorg · Feb 2, 2018 · 8645d40 · 8645d40
2 parents 5a1ddc0 + 48d77b0
commit 8645d40
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 32 deletions.
diff --git a/...artbeat/src/main/java/com/creditease/agent/feature/nodeopagent/actions/MOFCtrlAction.java b/...artbeat/src/main/java/com/creditease/agent/feature/nodeopagent/actions/MOFCtrlAction.java
@@ -86,13 +86,26 @@ public void completed(HttpClientCallbackResult result) {
 
                 String res = result.getReplyDataAsString();
 
-                log.info(this, "MOFCtrlAction Success: url=" + url + ", res=" + res);
-
-                if (!StringHelper.isEmpty(res)) {
-                    isSuccess.set(true);
+                if (result.getRetCode() >= 400) {
+                    log.err(this,
+                            "MOFCtrlAction FAIL: retcode=" + result.getRetCode() + ", url=" + url + ", err=" + res);
+                    if (result.getRetCode() >= 500) {
+                        response.append("请求" + url + "完成时的状态码为【" + result.getRetCode() + "】, 服务器遇到错误而不能完成该请求.");
+                    }
+                    else {
+                        response.append("请求" + url + "完成时的状态码为【" + result.getRetCode() + "】, 请求客户端错误.");
+                    }
+
+                    isSuccess.set(false);
+                }
+                else {
+                    response.append(res);
+                    log.info(this,
+                            "MOFCtrlAction Success: retcode=" + result.getRetCode() + ", url=" + url + ", res=" + res);
+                    if (!StringHelper.isEmpty(res)) {
+                        isSuccess.set(true);
+                    }
                 }
-
-                response.append(res);
 
                 cdl.countDown();
             }

diff --git a/com.creditease.uav.healthmanager.buildComponent/config/agent.properties b/com.creditease.uav.healthmanager.buildComponent/config/agent.properties
@@ -169,9 +169,9 @@ feature.healthmanager.MT_Monitor.ds.servers=127.0.0.1:4243
 feature.healthmanager.MT_Monitor.ds.db=monitorDataStore
 feature.healthmanager.MT_Monitor.ds.maxPerRoute=10
 feature.healthmanager.MT_Monitor.ds.maxRoute=50
-feature.healthmanager.MT_Monitor.ds.soTimeout=10000
-feature.healthmanager.MT_Monitor.ds.connTimeout=5000
-feature.healthmanager.MT_Monitor.ds.reqTimeout=3000
+feature.healthmanager.MT_Monitor.ds.soTimeout=30000
+feature.healthmanager.MT_Monitor.ds.connTimeout=30000
+feature.healthmanager.MT_Monitor.ds.reqTimeout=30000
 feature.healthmanager.MT_Monitor.ds.retry=3
 #opentsdb batch size
 feature.healthmanager.MT_Monitor.ds.batchsize=50

diff --git a/com.creditease.uav.healthmanager.buildComponent/config/hm_pro_logserver.properties b/com.creditease.uav.healthmanager.buildComponent/config/hm_pro_logserver.properties
@@ -133,9 +133,9 @@ feature.healthmanager.MT_Monitor.ds.servers=127.0.0.1:4242,127.0.0.1:4242
 feature.healthmanager.MT_Monitor.ds.db=monitorDataStore
 feature.healthmanager.MT_Monitor.ds.maxPerRoute=10
 feature.healthmanager.MT_Monitor.ds.maxRoute=50
-feature.healthmanager.MT_Monitor.ds.soTimeout=10000
-feature.healthmanager.MT_Monitor.ds.connTimeout=5000
-feature.healthmanager.MT_Monitor.ds.reqTimeout=3000
+feature.healthmanager.MT_Monitor.ds.soTimeout=30000
+feature.healthmanager.MT_Monitor.ds.connTimeout=30000
+feature.healthmanager.MT_Monitor.ds.reqTimeout=30000
 #opentsdb batch size
 feature.healthmanager.MT_Monitor.ds.batchsize=50
 feature.healthmanager.MT_Monitor.ds.retry=3

diff --git a/com.creditease.uav.healthmanager.buildComponent/config/hm_pro_pfntfyserver.properties b/com.creditease.uav.healthmanager.buildComponent/config/hm_pro_pfntfyserver.properties
@@ -134,9 +134,9 @@ feature.healthmanager.MT_Monitor.ds.servers=127.0.0.1:4242,127.0.0.1:4242
 feature.healthmanager.MT_Monitor.ds.db=monitorDataStore
 feature.healthmanager.MT_Monitor.ds.maxPerRoute=10
 feature.healthmanager.MT_Monitor.ds.maxRoute=50
-feature.healthmanager.MT_Monitor.ds.soTimeout=10000
-feature.healthmanager.MT_Monitor.ds.connTimeout=5000
-feature.healthmanager.MT_Monitor.ds.reqTimeout=3000
+feature.healthmanager.MT_Monitor.ds.soTimeout=30000
+feature.healthmanager.MT_Monitor.ds.connTimeout=30000
+feature.healthmanager.MT_Monitor.ds.reqTimeout=30000
 #opentsdb batch size
 feature.healthmanager.MT_Monitor.ds.batchsize=50
 feature.healthmanager.MT_Monitor.ds.retry=3

diff --git a/com.creditease.uav.healthmanager.buildComponent/config/hm_test_logserver.properties b/com.creditease.uav.healthmanager.buildComponent/config/hm_test_logserver.properties
@@ -134,9 +134,9 @@ feature.healthmanager.MT_Monitor.ds.servers=127.0.0.1:4243
 feature.healthmanager.MT_Monitor.ds.db=monitorDataStore
 feature.healthmanager.MT_Monitor.ds.maxPerRoute=10
 feature.healthmanager.MT_Monitor.ds.maxRoute=50
-feature.healthmanager.MT_Monitor.ds.soTimeout=10000
-feature.healthmanager.MT_Monitor.ds.connTimeout=5000
-feature.healthmanager.MT_Monitor.ds.reqTimeout=3000
+feature.healthmanager.MT_Monitor.ds.soTimeout=30000
+feature.healthmanager.MT_Monitor.ds.connTimeout=30000
+feature.healthmanager.MT_Monitor.ds.reqTimeout=30000
 #opentsdb batch size
 feature.healthmanager.MT_Monitor.ds.batchsize=50
 feature.healthmanager.MT_Monitor.ds.retry=3

diff --git a/com.creditease.uav.healthmanager.buildComponent/config/hm_test_moserver.properties b/com.creditease.uav.healthmanager.buildComponent/config/hm_test_moserver.properties
@@ -135,9 +135,9 @@ feature.healthmanager.MT_Monitor.ds.servers=127.0.0.1:4243
 feature.healthmanager.MT_Monitor.ds.db=monitorDataStore
 feature.healthmanager.MT_Monitor.ds.maxPerRoute=10
 feature.healthmanager.MT_Monitor.ds.maxRoute=50
-feature.healthmanager.MT_Monitor.ds.soTimeout=10000
-feature.healthmanager.MT_Monitor.ds.connTimeout=5000
-feature.healthmanager.MT_Monitor.ds.reqTimeout=3000
+feature.healthmanager.MT_Monitor.ds.soTimeout=30000
+feature.healthmanager.MT_Monitor.ds.connTimeout=30000
+feature.healthmanager.MT_Monitor.ds.reqTimeout=30000
 #opentsdb batch size
 feature.healthmanager.MT_Monitor.ds.batchsize=300
 feature.healthmanager.MT_Monitor.ds.retry=3

diff --git a/com.creditease.uav.healthmanager.buildComponent/config/hm_test_nodeserver.properties b/com.creditease.uav.healthmanager.buildComponent/config/hm_test_nodeserver.properties
@@ -135,9 +135,9 @@ feature.healthmanager.MT_Monitor.ds.servers=127.0.0.1:4243
 feature.healthmanager.MT_Monitor.ds.db=monitorDataStore
 feature.healthmanager.MT_Monitor.ds.maxPerRoute=10
 feature.healthmanager.MT_Monitor.ds.maxRoute=50
-feature.healthmanager.MT_Monitor.ds.soTimeout=10000
-feature.healthmanager.MT_Monitor.ds.connTimeout=5000
-feature.healthmanager.MT_Monitor.ds.reqTimeout=3000
+feature.healthmanager.MT_Monitor.ds.soTimeout=30000
+feature.healthmanager.MT_Monitor.ds.connTimeout=30000
+feature.healthmanager.MT_Monitor.ds.reqTimeout=30000
 #opentsdb batch size
 feature.healthmanager.MT_Monitor.ds.batchsize=300
 feature.healthmanager.MT_Monitor.ds.retry=3

diff --git a/com.creditease.uav.healthmanager.buildComponent/config/hm_test_pnhbserver.properties b/com.creditease.uav.healthmanager.buildComponent/config/hm_test_pnhbserver.properties
@@ -205,9 +205,9 @@ feature.healthmanager.MT_Monitor.ds.servers=127.0.0.1:4243
 feature.healthmanager.MT_Monitor.ds.db=monitorDataStore
 feature.healthmanager.MT_Monitor.ds.maxPerRoute=10
 feature.healthmanager.MT_Monitor.ds.maxRoute=50
-feature.healthmanager.MT_Monitor.ds.soTimeout=10000
-feature.healthmanager.MT_Monitor.ds.connTimeout=5000
-feature.healthmanager.MT_Monitor.ds.reqTimeout=3000
+feature.healthmanager.MT_Monitor.ds.soTimeout=30000
+feature.healthmanager.MT_Monitor.ds.connTimeout=30000
+feature.healthmanager.MT_Monitor.ds.reqTimeout=30000
 #opentsdb batch size
 feature.healthmanager.MT_Monitor.ds.batchsize=50
 feature.healthmanager.MT_Monitor.ds.retry=3

diff --git a/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/HealthManager.java b/com.creditease.uav.healthmanager/src/main/java/com/creditease/uav/feature/HealthManager.java
@@ -73,6 +73,7 @@ public class HealthManager extends AgentFeatureComponent {
     private boolean isStartLifeKeeper = false;
 
     public HealthManager(String cName, String feature) {
+
         super(cName, feature);
     }
 
@@ -378,15 +379,15 @@ private void buildDataStores(IConfigurationManager icm) {
         buildDataStore(icm, notifyKey, DataStoreType.MONGODB, new NotifyDataAdpater(), null);
 
         Map<String, Object> nctx = new HashMap<String, Object>();
-        mctx.put(DataStoreProtocol.OPENTSDB_CLIENT_MAXPERROUTE, DataConvertHelper
+        nctx.put(DataStoreProtocol.OPENTSDB_CLIENT_MAXPERROUTE, DataConvertHelper
                 .toInt(icm.getFeatureConfiguration(this.feature, nodeinfoKey + ".ds.maxPerRoute"), 10));
-        mctx.put(DataStoreProtocol.OPENTSDB_CLIENT_MAXROUTE,
+        nctx.put(DataStoreProtocol.OPENTSDB_CLIENT_MAXROUTE,
                 DataConvertHelper.toInt(icm.getFeatureConfiguration(this.feature, nodeinfoKey + ".ds.maxRoute"), 50));
-        mctx.put(DataStoreProtocol.OPENTSDB_CLIENT_SOTIMEOUT, DataConvertHelper
+        nctx.put(DataStoreProtocol.OPENTSDB_CLIENT_SOTIMEOUT, DataConvertHelper
                 .toInt(icm.getFeatureConfiguration(this.feature, nodeinfoKey + ".ds.soTimeout"), 5000));
-        mctx.put(DataStoreProtocol.OPENTSDB_CLIENT_CONNTIMEOUT, DataConvertHelper
+        nctx.put(DataStoreProtocol.OPENTSDB_CLIENT_CONNTIMEOUT, DataConvertHelper
                 .toInt(icm.getFeatureConfiguration(this.feature, nodeinfoKey + ".ds.connTimeout"), 5000));
-        mctx.put(DataStoreProtocol.OPENTSDB_CLIENT_REQTIMEOUT, DataConvertHelper
+        nctx.put(DataStoreProtocol.OPENTSDB_CLIENT_REQTIMEOUT, DataConvertHelper
                 .toInt(icm.getFeatureConfiguration(this.feature, nodeinfoKey + ".ds.reqTimeout"), 5000));
 
         // build nodeinfo ds

diff --git a/...n/java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NotifyDataAdpater.java b/...n/java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NotifyDataAdpater.java
@@ -79,6 +79,7 @@ public Object prepareInsertObj(DataStoreMsg msg, DataStoreConnection NotifyDataA
             document.put("ip", ne.getIP());
             document.put("appgroup", args.get("appgroup"));
             document.put("createtime", System.currentTimeMillis());
+            document.put("notifyType", getNotifyType(ne.getTitle()));
 
             documents.add(document);
         }
@@ -119,4 +120,13 @@ public String getKeyfromNTFE(NotificationEvent data) {
         return key;
     }
 
+    public static String getNotifyType(String title) {
+        String[] titleArray = title.split("@");
+        if (titleArray.length > 2) {
+            return titleArray[1];
+        }
+        else {
+            return "UNKNOWN";
+        }
+    }
 }