Merge pull request #162 from qq254963746/develop

qq254963746 · qq254963746 · commit ffa0b8ed0a11 · 2015-11-21T23:14:55.000+08:00
增加 MasterSalveLoadBalance
diff --git a/lts-core/src/main/java/com/lts/core/json/JSON.java b/lts-core/src/main/java/com/lts/core/json/JSON.java
@@ -11,22 +11,22 @@
  */
 public class JSON {
 
-    private static JSONAdapter aware = JSONFactory.getJSONAdapter();
+    private static JSONAdapter adapter = JSONFactory.getJSONAdapter();
 
     public static final <T> T parse(String json, Type type) {
         try {
             if (StringUtils.isEmpty(json)) {
                 return null;
             }
-            return aware.parse(json, type);
+            return adapter.parse(json, type);
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final <T> T parse(String json, TypeReference<T> typeReference) {
         try {
-            return aware.parse(json, typeReference.getType());
+            return adapter.parse(json, typeReference.getType());
         } catch (Exception e) {
             throw new JSONException(e);
         }
@@ -37,7 +37,7 @@ public static final String toJSONString(Object obj) {
             if (obj == null) {
                 return null;
             }
-            return aware.toJSONString(obj);
+            return adapter.toJSONString(obj);
         } catch (Exception e) {
             throw new JSONException(e);
         }
@@ -48,7 +48,7 @@ public static final JSONObject toJSONObject(Object obj) {
             if (obj == null) {
                 return null;
             }
-            return aware.toJSONObject(obj);
+            return adapter.toJSONObject(obj);
         } catch (Exception e) {
             throw new JSONException(e);
         }
@@ -59,71 +59,71 @@ public static final JSONArray toJSONArray(Object obj) {
             if (obj == null) {
                 return null;
             }
-            return aware.toJSONArray(obj);
+            return adapter.toJSONArray(obj);
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONArray parseArray(String obj) {
         try {
-            return aware.parseArray(obj);
+            return adapter.parseArray(obj);
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONObject parseObject(String obj) {
         try {
-            return aware.parseObject(obj);
+            return adapter.parseObject(obj);
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONObject newJSONObject() {
         try {
-            return aware.newJSONObject();
+            return adapter.newJSONObject();
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONArray newJSONArray() {
         try {
-            return aware.newJSONArray();
+            return adapter.newJSONArray();
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONObject newJSONObject(Map<String, Object> map) {
         try {
-            return aware.newJSONObject(map);
+            return adapter.newJSONObject(map);
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONObject newJSONObject(int initialCapacity) {
         try {
-            return aware.newJSONObject(initialCapacity);
+            return adapter.newJSONObject(initialCapacity);
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONArray newJSONArray(List<Object> list) {
         try {
-            return aware.newJSONArray(list);
+            return adapter.newJSONArray(list);
         } catch (Exception e) {
             throw new JSONException(e);
         }
     }
 
     public static final JSONArray newJSONArray(int initialCapacity) {
         try {
-            return aware.newJSONArray(initialCapacity);
+            return adapter.newJSONArray(initialCapacity);
         } catch (Exception e) {
             throw new JSONException(e);
         }
diff --git a/lts-core/src/main/java/com/lts/core/loadbalance/MasterSalveLoadBalance.java b/lts-core/src/main/java/com/lts/core/loadbalance/MasterSalveLoadBalance.java
@@ -0,0 +1,31 @@
+package com.lts.core.loadbalance;
+
+import com.lts.core.cluster.Node;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * 主从模式: 譬如将JobClient和TaskTracker设置为这种负载均衡模式,
+ * 那么总会去连接最老的一台JobTracker,而从达到主从模式的效果
+ *
+ * @author Robert HG (254963746@qq.com) on 11/21/15.
+ */
+public class MasterSalveLoadBalance extends AbstractLoadBalance {
+
+    @Override
+    protected <S> S doSelect(List<S> shards, String seed) {
+
+        if (shards.get(0) instanceof Node) {
+            Collections.sort(shards, new Comparator<S>() {
+                @Override
+                public int compare(S left, S right) {
+                    return ((Node) left).getCreateTime().compareTo(((Node) right).getCreateTime());
+                }
+            });
+        }
+
+        return shards.get(0);
+    }
+}
diff --git a/lts-jobtracker/src/main/java/com/lts/jobtracker/complete/chain/GetNewJobChain.java b/lts-jobtracker/src/main/java/com/lts/jobtracker/complete/chain/GetNewJobChain.java
@@ -10,6 +10,8 @@
 import com.lts.remoting.protocol.RemotingProtos;
 
 /**
+ * 接受新任务Chain
+ *
  * @author Robert HG (254963746@qq.com) on 11/11/15.
  */
 public class GetNewJobChain implements JobCompletedChain {
diff --git a/lts-jobtracker/src/main/java/com/lts/jobtracker/complete/chain/JobProcessChain.java b/lts-jobtracker/src/main/java/com/lts/jobtracker/complete/chain/JobProcessChain.java
@@ -20,6 +20,7 @@
 import java.util.List;
 
 /**
+ * 任务完成 Chian
  * @author Robert HG (254963746@qq.com) on 11/11/15.
  */
 public class JobProcessChain implements JobCompletedChain {
diff --git a/lts-jobtracker/src/main/java/com/lts/jobtracker/complete/chain/JobStatisticChain.java b/lts-jobtracker/src/main/java/com/lts/jobtracker/complete/chain/JobStatisticChain.java
@@ -19,6 +19,7 @@
 import java.util.List;
 
 /**
+ * 任务数据统计 Chain
  * @author Robert HG (254963746@qq.com) on 11/11/15.
  */
 public class JobStatisticChain implements JobCompletedChain {
diff --git a/lts-jobtracker/src/main/java/com/lts/jobtracker/processor/JobCompletedProcessor.java b/lts-jobtracker/src/main/java/com/lts/jobtracker/processor/JobCompletedProcessor.java
@@ -26,9 +26,9 @@ public JobCompletedProcessor(final JobTrackerApplication application) {
         super(application);
 
         this.chains = new CopyOnWriteArrayList<JobCompletedChain>();
-        this.chains.add(new JobStatisticChain(application));
-        this.chains.add(new JobProcessChain(application));
-        this.chains.add(new GetNewJobChain(application));
+        this.chains.add(new JobStatisticChain(application));        // 统计
+        this.chains.add(new JobProcessChain(application));          // 完成处理
+        this.chains.add(new GetNewJobChain(application));           // 获取新任务
 
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,22 +11,22 @@`
`11`	`11`	`*/`
`12`	`12`	`public class JSON {`
`13`	`13`
`14`		`- private static JSONAdapter aware = JSONFactory.getJSONAdapter();`
	`14`	`+ private static JSONAdapter adapter = JSONFactory.getJSONAdapter();`
`15`	`15`
`16`	`16`	`public static final <T> T parse(String json, Type type) {`
`17`	`17`	`try {`
`18`	`18`	`if (StringUtils.isEmpty(json)) {`
`19`	`19`	`return null;`
`20`	`20`	`}`
`21`		`- return aware.parse(json, type);`
	`21`	`+ return adapter.parse(json, type);`
`22`	`22`	`} catch (Exception e) {`
`23`	`23`	`throw new JSONException(e);`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public static final <T> T parse(String json, TypeReference<T> typeReference) {`
`28`	`28`	`try {`
`29`		`- return aware.parse(json, typeReference.getType());`
	`29`	`+ return adapter.parse(json, typeReference.getType());`
`30`	`30`	`} catch (Exception e) {`
`31`	`31`	`throw new JSONException(e);`
`32`	`32`	`}`
`@@ -37,7 +37,7 @@ public static final String toJSONString(Object obj) {`
`37`	`37`	`if (obj == null) {`
`38`	`38`	`return null;`
`39`	`39`	`}`
`40`		`- return aware.toJSONString(obj);`
	`40`	`+ return adapter.toJSONString(obj);`
`41`	`41`	`} catch (Exception e) {`
`42`	`42`	`throw new JSONException(e);`
`43`	`43`	`}`
`@@ -48,7 +48,7 @@ public static final JSONObject toJSONObject(Object obj) {`
`48`	`48`	`if (obj == null) {`
`49`	`49`	`return null;`
`50`	`50`	`}`
`51`		`- return aware.toJSONObject(obj);`
	`51`	`+ return adapter.toJSONObject(obj);`
`52`	`52`	`} catch (Exception e) {`
`53`	`53`	`throw new JSONException(e);`
`54`	`54`	`}`
`@@ -59,71 +59,71 @@ public static final JSONArray toJSONArray(Object obj) {`
`59`	`59`	`if (obj == null) {`
`60`	`60`	`return null;`
`61`	`61`	`}`
`62`		`- return aware.toJSONArray(obj);`
	`62`	`+ return adapter.toJSONArray(obj);`
`63`	`63`	`} catch (Exception e) {`
`64`	`64`	`throw new JSONException(e);`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public static final JSONArray parseArray(String obj) {`
`69`	`69`	`try {`
`70`		`- return aware.parseArray(obj);`
	`70`	`+ return adapter.parseArray(obj);`
`71`	`71`	`} catch (Exception e) {`
`72`	`72`	`throw new JSONException(e);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public static final JSONObject parseObject(String obj) {`
`77`	`77`	`try {`
`78`		`- return aware.parseObject(obj);`
	`78`	`+ return adapter.parseObject(obj);`
`79`	`79`	`} catch (Exception e) {`
`80`	`80`	`throw new JSONException(e);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public static final JSONObject newJSONObject() {`
`85`	`85`	`try {`
`86`		`- return aware.newJSONObject();`
	`86`	`+ return adapter.newJSONObject();`
`87`	`87`	`} catch (Exception e) {`
`88`	`88`	`throw new JSONException(e);`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`public static final JSONArray newJSONArray() {`
`93`	`93`	`try {`
`94`		`- return aware.newJSONArray();`
	`94`	`+ return adapter.newJSONArray();`
`95`	`95`	`} catch (Exception e) {`
`96`	`96`	`throw new JSONException(e);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public static final JSONObject newJSONObject(Map<String, Object> map) {`
`101`	`101`	`try {`
`102`		`- return aware.newJSONObject(map);`
	`102`	`+ return adapter.newJSONObject(map);`
`103`	`103`	`} catch (Exception e) {`
`104`	`104`	`throw new JSONException(e);`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public static final JSONObject newJSONObject(int initialCapacity) {`
`109`	`109`	`try {`
`110`		`- return aware.newJSONObject(initialCapacity);`
	`110`	`+ return adapter.newJSONObject(initialCapacity);`
`111`	`111`	`} catch (Exception e) {`
`112`	`112`	`throw new JSONException(e);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`public static final JSONArray newJSONArray(List<Object> list) {`
`117`	`117`	`try {`
`118`		`- return aware.newJSONArray(list);`
	`118`	`+ return adapter.newJSONArray(list);`
`119`	`119`	`} catch (Exception e) {`
`120`	`120`	`throw new JSONException(e);`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public static final JSONArray newJSONArray(int initialCapacity) {`
`125`	`125`	`try {`
`126`		`- return aware.newJSONArray(initialCapacity);`
	`126`	`+ return adapter.newJSONArray(initialCapacity);`
`127`	`127`	`} catch (Exception e) {`
`128`	`128`	`throw new JSONException(e);`
`129`	`129`	`}`