From ada388b4644de6fd4051be4bab8289b293001d59 Mon Sep 17 00:00:00 2001 From: ywang19 Date: Mon, 5 Jan 2015 20:12:48 +0800 Subject: [PATCH 1/6] update version Signed-off-by: ywang19 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 44bb5d1f..985588d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.1 \ No newline at end of file +0.4.2 From 97a50b12967b29041809e497ed4da54b6ca23f74 Mon Sep 17 00:00:00 2001 From: David DeFlyer Date: Thu, 8 Jan 2015 11:35:19 -0800 Subject: [PATCH 2/6] Adding stage info to cli "info" output. --- .../com/intel/cosbench/controller/handler/IndexHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 709cae3c..e25090c6 100644 --- 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 @@ -47,7 +47,8 @@ protected String process(HttpServletRequest req, HttpServletResponse res) 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') + .append(workload.getCurrentStage().getId()).append('\n'); buffer.append("Total:").append(' ').append(workloads.length) .append(' ').append("active workloads").append('\n'); return buffer.toString(); From 4421dc996a79ab0b5dbf1ffc1d04979dc6cc2534 Mon Sep 17 00:00:00 2001 From: David DeFlyer Date: Thu, 8 Jan 2015 12:03:58 -0800 Subject: [PATCH 3/6] Needed to make it work with multiple jobs in the queue. --- .../cosbench/controller/handler/IndexHandler.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 index e25090c6..da3717a6 100644 --- 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,11 +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('\t') - .append(workload.getCurrentStage().getId()).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(); From 4e543df87934e762928f6f94975977011592767d Mon Sep 17 00:00:00 2001 From: ywang19 Date: Mon, 5 Jan 2015 20:12:48 +0800 Subject: [PATCH 4/6] update version Signed-off-by: ywang19 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 44bb5d1f..985588d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.1 \ No newline at end of file +0.4.2 From 9f289e7e510e50f2ca76b63647f029d42af52c93 Mon Sep 17 00:00:00 2001 From: xiaoerlyl Date: Wed, 28 Jan 2015 11:06:27 +0800 Subject: [PATCH 5/6] version unify script --- version_unify.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 version_unify.sh diff --git a/version_unify.sh b/version_unify.sh new file mode 100644 index 00000000..0eda0fe6 --- /dev/null +++ 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 + + + From a9ab0c24f80a9c505f71a616a66f6f5938bee0e6 Mon Sep 17 00:00:00 2001 From: xiaoerlyl Date: Fri, 30 Jan 2015 22:47:30 +0800 Subject: [PATCH 6/6] fix the loopback ip bingding bug --- .../intel/cosbench/controller/service/PingDriverRunner.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 30b9bbee..7d936b5b 100644 --- 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; } + }