Merge remote-tracking branch 'upstream/0.4.2.0' into 0.4.2.0

liyuanwa · Feb 2, 2015 · 52aab36 · 52aab36
2 parents 11f094f + 75a2d7c
commit 52aab36
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.1
+0.4.2
diff --git a/dev/cosbench-controller-web/src/com/intel/cosbench/controller/handler/IndexHandler.java b/dev/cosbench-controller-web/src/com/intel/cosbench/controller/handler/IndexHandler.java
@@ -44,10 +44,16 @@ protected String process(HttpServletRequest req, HttpServletResponse res)
         buffer.append('\n');
         WorkloadInfo[] workloads = controller.getActiveWorkloads();
         buffer.append("Active Workloads:").append('\n');
-        for (WorkloadInfo workload : workloads)
+        for (WorkloadInfo workload : workloads) {
             buffer.append(workload.getId()).append('\t')
                     .append(workload.getSubmitDate()).append('\t')
-                    .append(workload.getState()).append('\n');
+                    .append(workload.getState()).append('\t');
+                    if (workload.getCurrentStage() != null) {
+                    	buffer.append(workload.getCurrentStage().getId()).append('\n');	
+                    } else {
+                    	buffer.append("None").append('\n');
+                    }
+        }
         buffer.append("Total:").append(' ').append(workloads.length)
                 .append(' ').append("active workloads").append('\n');
         return buffer.toString();

diff --git a/dev/cosbench-controller/src/com/intel/cosbench/controller/service/PingDriverRunner.java b/dev/cosbench-controller/src/com/intel/cosbench/controller/service/PingDriverRunner.java
@@ -53,7 +53,7 @@ private void pingDrivers(DriverInfo[] driverInfos) {
 					try{
 						Socket socket = new Socket();
 						InetSocketAddress reAddress = new InetSocketAddress(ipAddress, 18088);
-						InetSocketAddress locAddress = new InetSocketAddress("127.0.0.1", 0);
+						InetSocketAddress locAddress = new InetSocketAddress("0.0.0.0", 0);
 						socket.bind(locAddress);
 						socket.connect(reAddress,3000);
 						isAlive = true;
@@ -72,6 +72,7 @@ private String getIpAddres(String url) {
 		int end = url.lastIndexOf(':');		
 		return end > start ? url.substring(start, end) : null;
 	}
+
 
 }
 
diff --git a/version_unify.sh b/version_unify.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+release_id=`cat VERSION`'.'$(date +%Y%m%d)
+echo "release id is: "$release_id
+for dir in `ls dev`
+do
+  f='dev/'$dir"/META-INF/MANIFEST.MF"
+  if [ -f $f ]	
+	then	  	 
+		sed -i "s/[0-9]\.[0-9]\.[0-9]\.[0-9]\{8\}/$release_id/g" $f
+		echo "file: "$f" is updated"
+	fi
+done
+for module in {driver,controller}
+do
+  web="dev/cosbench-"$module"-web/WEB-INF/freemarker/header.ftl"
+  if [ -f $web ]
+  then 
+  	sed -i "s/[0-9]\.[0-9]\.[0-9]\.[0-9]\{8\}/$release_id/g" $web
+	echo "file "$web " is updated"
+  fi
+done
+
+
+