Merge branch 'master' of https://github.com/alibaba/dubbo

juen · Aug 31, 2012 · d613f42 · d613f42
2 parents 4ac044f + f2e74a9
commit d613f42
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java b/...-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java
@@ -41,7 +41,16 @@ public <T> Invoker<T> select(List<Invoker<T>> invokers, URL url, Invocation invo
     protected abstract <T> Invoker<T> doSelect(List<Invoker<T>> invokers, URL url, Invocation invocation);
 
     protected int getWeight(Invoker<?> invoker, Invocation invocation) {
-        return invoker.getUrl().getMethodParameter(invocation.getMethodName(), Constants.WEIGHT_KEY, Constants.DEFAULT_WEIGHT);
+        int weight = invoker.getUrl().getMethodParameter(invocation.getMethodName(), Constants.WEIGHT_KEY, Constants.DEFAULT_WEIGHT);
+        long timestamp = invoker.getUrl().getParameter(Constants.TIMESTAMP_KEY, 0L);
+    	if (timestamp > 0L) {
+    		int uptime = (int) (System.currentTimeMillis() - timestamp);
+    		int warmup = invoker.getUrl().getParameter(Constants.WARMUP_KEY, Constants.DEFAULT_WARMUP);
+    		if (uptime > 0 && uptime < warmup) {
+    			weight = uptime / (warmup / weight);
+    		}
+    	}
+    	return weight;
     }
 
 }
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java
@@ -295,6 +295,10 @@ public class Constants {
     public static final String  PID_KEY                            = "pid";
 
     public static final String  TIMESTAMP_KEY                      = "timestamp";
+
+    public static final String  WARMUP_KEY                         = "warmup";
+
+    public static final int     DEFAULT_WARMUP                     = 10 * 60 * 1000;
 
     public static final String  CHECK_KEY                          = "check";