intel-cloud · wangqi2725 · Jan 16, 2015 · Jan 16, 2015 · Jan 16, 2015 · Jan 16, 2015
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+dist/osgi/plugins/cosbench*.jar
 
 # Package Files #
 /0.3.0.10

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+language: java
+java:
+  - openjdk6
+  - oraclejdk6
+  - openjdk7
+  - oraclejdk7
+
+install: PLEASE CHANGE ME
+script: PLEASE CHANGE ME
diff --git a/BUILD-openio.md b/BUILD-openio.md
@@ -0,0 +1,36 @@
+Overview
+--------
+
+The following procedure indicates how to compile and package cosbench for OpenIO. 
+First, please read [BUILD.md](BUILD.md).
+
+
+Development Environment
+-----------------------
+
+To get a running comilation environment, please refer to the same section in [BUILD.md#development-environment](BUILD.md#development-environment).
+
+Note that Eclipse **4.7.3a** is a knwon working release. You must use **JDK 1.8** and configure eclipse this way:
+
+1. in `Window -> Preferences -> Java -> Prefered JRE` ensure a JDK 1.8 is selected.
+
+2. in `Window -> Preferences -> Java -> Compiler` ensure `Compiler compliance level` is set to **1.8**.
+
+Releasing new version
+---------------------
+
+When you are ready to release a new version:
+
+1. Update the file `VERSION`.
+
+2. Update the version in `dev/*/META-INF/MANIFEST.MF` by running the script `./version_unify.sh`.
+
+3. Remove previous JAR: `rm dist/osgi/plugins/cosbench-*.jar`.
+
+4. In eclipe, select all project, right click then `export ... -> Plug-in Development -> Deployable plugins and fragments`.
+
+5. Run `./pack-openio.sh` to generate `cosbench-$VERSION-openio.tar.gz`.
+
+6. Commit changes, tag to `${VERSION}-openio` and push to git (tagging can be done when making a new release from the github page).
+
+7. Create a release from [github page](https://github.com/open-io/cosbench/releases).
diff --git a/BUILD.md b/BUILD.md
@@ -30,7 +30,7 @@ Development Environment
 
 Below are steps to set up development environment in eclipse:
 
-1. download eclipse SDK (Juno) from http://www.eclipse.org/downloads/
+1. download eclipse SDK from [http://download.eclipse.org/eclipse/downloads/](http://download.eclipse.org/eclipse/downloads/), and we are using the version 4.2.1 (Juno).
 
 2. get cosbench source code tree by git or downloading the whole zip package.
 

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,79 +1,108 @@
+  COSBench 0.4.2.c3(15-ww32.5)
+------------------------------------
+- #279: "IsAlive" for drivers goes red after a while 
+- #278: unable to run workload against HP public cloud 
+- #276: no response with any data when running on RHEL 7.1 
+- #275: It appears that Cosbench does not properly close driver sockets. 
+- #274: FreeMarker template error: The following has evaluated to null or missing ... 
+- #270: S3: Timeout modifies only the connection timeout 
+
+
+  COSBench 0.4.2.c2(15-ww15.3)
+------------------------------------
+- #267: v0.4.2.c1: Swift/Keystone regression 
+- #265: S3: Need configurable max_connections for AmazonS3Client 
+- #260: when testing ceph giant through librados adapter, some errors like EINPROGRESS raises 
+- #254: Mixed Workloads (Read,Write,Delete) cause low read success rate. 
+- #227: CLI script doesn't show current stage 
+- #87: [WorkloadConfigurator] Add support for specifying number of drivers and workers-per-driver (extension to #86) 
+- #5: real-time performance grap
+- #221: Dumping of Per driver result
+- #210: multiple drivers on the same physical node
+- #252: too many open files” errors with filewrite type 
+- #236: Keystone needs to accept region name as parameter. 
+- #250: hard to distinguish different operations under the same work item from U
+- #238: Working with Ceph 0.87 encountered errors 
+- #245: Driver not alive
+- #240: cosbench is not starting under CentOS 
+
+
   COSBench 0.4.1.0(14-ww53.2)
 ------------------------------------
-. Add one workload under workloads folder, whose distribution is summarized from two week's trace on ASUS WebStorage. Thanks ASUS' contribution!
-. #223: current authorization doesn't support retry 
-. #222: completed operation count is mismatching with configured totalOps 
-. #220: UI: The current stage table shouldn't merge with stage table when workload terminates
-. #212 swift show 401 error code
-. #194 Config UI: Add detail to General Report Table located in view details section of Active Workloads : Need to add information about stage names 
-. #188 UI: Don't generate stagenames with comma characters in them
+- Add one workload under workloads folder, whose distribution is summarized from two week's trace on ASUS WebStorage. Thanks ASUS' contribution!
+- #223: current authorization doesn't support retry 
+- #222: completed operation count is mismatching with configured totalOps 
+- #220: UI: The current stage table shouldn't merge with stage table when workload terminates
+- #212 swift show 401 error code
+- #194 Config UI: Add detail to General Report Table located in view details section of Active Workloads : Need to add information about stage names 
+- #188 UI: Don't generate stagenames with comma characters in them
 
 
   COSBench 0.4.0.1(14-ww48.5)
 ------------------------------------
-. #214: ceph prepare stage very low success ratio and throwing erros 
-. #211: SwiftTokenCache needs to validate current token is valid
-. #203: the driver "isAlive" status is green even the driver is not started 
-. #198: in v0.4.0.0, it seems the AFR doesn't take in effect in prepare stage 
-. #191: cosbench-start.sh fails while executing 'nc': TOOL_PARAMS is incorrect.
-. #190: Config UI: Add detail to cleanup/dispose stage names 
-. #186: UI: Add detail to init and prepare stage names 
-. #178: Collect and view results for user-terminated jobs 
-. #159: Extend "histogram" selector to support "floating point" weights/percentages 
-. #156: Add "trigger" support
-. #154: Add authentication caching support
-. #147: UI: Advanced config UI Cleanup (part 1) 
-. #146: UI: Add tooltips to configurable params on the config UI
-. #145: UI: Change storage url template depending on the storage type chosen
-. #32: digest authentication support
-. #29: Error handling improvement
-. #19: Support LIST Api
-. #12: after several hours running, cosbench's banners all disappear. 
+- #214: ceph prepare stage very low success ratio and throwing erros 
+- #211: SwiftTokenCache needs to validate current token is valid
+- #203: the driver "isAlive" status is green even the driver is not started 
+- #198: in v0.4.0.0, it seems the AFR doesn't take in effect in prepare stage 
+- #191: cosbench-start.sh fails while executing 'nc': TOOL_PARAMS is incorrect.
+- #190: Config UI: Add detail to cleanup/dispose stage names 
+- #186: UI: Add detail to init and prepare stage names 
+- #178: Collect and view results for user-terminated jobs 
+- #159: Extend "histogram" selector to support "floating point" weights/percentages 
+- #156: Add "trigger" support
+- #154: Add authentication caching support
+- #147: UI: Advanced config UI Cleanup (part 1) 
+- #146: UI: Add tooltips to configurable params on the config UI
+- #145: UI: Change storage url template depending on the storage type chosen
+- #32: digest authentication support
+- #29: Error handling improvement
+- #19: Support LIST Api
+- #12: after several hours running, cosbench's banners all disappear. 
 
 
   COSBench 0.4.0.0 (14-ww21.5)
 ------------------------------------
-. #57: time synchronization
-. #96: Creating Web UI facility for generating different workload configuration files
-. #155: Add support for "acceptable failure rate, failure %" to all stages
-. #4: xml validator
-. #77: contextual parameter list
-. #167: storage policy supporting for openstack swift
-. #37: support CDMI interface
-. #139: NullPointerException when a mission is aborted
-. #166: show driver alive state on controller index page
-. #158: Extend "histogram" selector to support "open ranges"
-. #165: enable Open range for object size in uniform and histogram
-. #136: 1 GB Object Reads Fail due to IllegalArgumentException
-. #99 (#152): measure and report the time for first and last byte in or out
-. #159: Extend "histogram" selector to support "floating point" weights/percentages
-. #143: at loading archived workloads, even there are 100 workloads, the UI shows only 98.
-. #140: duplicated workload id generated 
-. #151: avoid being challenged for each request
-. #137: when there are large # of archive jobs, exception will raise from archive list on web portal.
-. #139: NullPointerException when a mission is aborted
-. support http BASIC and DIGEST authentication
-. add cdmi base and util bundle
-. add cdmi adapter for swift+cdmi middleware
+- #57: time synchronization
+- #96: Creating Web UI facility for generating different workload configuration files
+- #155: Add support for "acceptable failure rate, failure %" to all stages
+- #4: xml validator
+- #77: contextual parameter list
+- #167: storage policy supporting for openstack swift
+- #37: support CDMI interface
+- #139: NullPointerException when a mission is aborted
+- #166: show driver alive state on controller index page
+- #158: Extend "histogram" selector to support "open ranges"
+- #165: enable Open range for object size in uniform and histogram
+- #136: 1 GB Object Reads Fail due to IllegalArgumentException
+- #99 (#152): measure and report the time for first and last byte in or out
+- #159: Extend "histogram" selector to support "floating point" weights/percentages
+- #143: at loading archived workloads, even there are 100 workloads, the UI shows only 98.
+- #140: duplicated workload id generated 
+- #151: avoid being challenged for each request
+- #137: when there are large # of archive jobs, exception will raise from archive list on web portal.
+- #139: NullPointerException when a mission is aborted
+- support http BASIC and DIGEST authentication
+- add cdmi base and util bundle
+- add cdmi adapter for swift+cdmi middleware
 
 
   COSBench 0.3.3.0 (13-ww44.5)
 ------------------------------------
-. #20: multiple same operations
-. #16: web console authentication
-. #34: 0% success on write
-. #11: job management
-. #70: multiple main stages
-. #30: no historical workloads after restart
-. add histogram selector to define histogram size distribution
-. #58: sleep between stage
-. #84: multiple init/prepare/cleanup/dispose from config UI
-. oen bug fix for java.lang.ArrayIndexOutOfBoundsException at data archiving
-. #118: file-write operation - percentile zero issue
-. #121: specify archive dir
-. #92: using swift storage without authentication
-. support auth token caching for swift testing
-. #128: Use workstage name from XML rather than generic names in logs
+- #20: multiple same operations
+- #16: web console authentication
+- #34: 0% success on write
+- #11: job management
+- #70: multiple main stages
+- #30: no historical workloads after restart
+- add histogram selector to define histogram size distribution
+- #58: sleep between stage
+- #84: multiple init/prepare/cleanup/dispose from config UI
+- oen bug fix for java.lang.ArrayIndexOutOfBoundsException at data archiving
+- #118: file-write operation - percentile zero issue
+- #121: specify archive dir
+- #92: using swift storage without authentication
+- support auth token caching for swift testing
+- #128: Use workstage name from XML rather than generic names in logs
 
 
   COSBench 0.3.1.2 (13-ww31.3)
@@ -115,4 +144,4 @@ COSBench 0.3.0.1 (13-ww17.5)
 
   COSBench 0.3.0.0 (13-ww15.5)
 ------------------------------------
-1. rebase version to 0.3.0 for open source
+1. rebase version to 0.3.0 for open source
diff --git a/COSBench-Quick-Start.pdf b/COSBench-Quick-Start.pdf
diff --git a/COSBench-User-Guide.odt b/COSBench-User-Guide.odt
diff --git a/COSBenchUserGuide.pdf b/COSBenchUserGuide.pdf
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,5 @@
 Copyright 2013 Intel Corporation, All Rights Reserved.
+Copyright 2019 OpenIO Corporation, All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +11,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ COSBench is a benchmarking tool to measure the performance of Cloud Object Stora
 emerging technology that is different from traditional file systems (e.g., NFS) or block device systems (e.g., iSCSI).
 Amazon S3 and Openstack* swift are well-known object storage solutions.
 
-COSBench now supports OpenStack* Swift, Amazon* S3, Amplidata v2.3, 2.5 and 3.1, Scality*, Ceph, CDMI, Google* Cloud Storage, Aliyun OSS as well as custom adaptors.
+COSBench now supports OpenStack* Swift, Amazon* S3, OpenIO*, Amplidata v2.3, 2.5 and 3.1, Scality*, Ceph, CDMI, Google* Cloud Storage, Aliyun OSS as well as custom adaptors.
 
 
 Important Notice and Contact Information

diff --git a/TODO.md b/TODO.md
@@ -4,14 +4,8 @@ COSBench is an ongoing project, in next six months, we plan to make below improv
 
 1. more storage interface support, list is TBD.
 
-2. authentication caching
-
-3. LIST operation
-
-4. workload packages shipped
-
 
 If you have any other suggestions or you want to work with us together. please contact us at [email protected].
 
 
-== END ==
+== END ==
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.2
+0.4.7
diff --git a/datescript.vbs b/datescript.vbs
@@ -0,0 +1 @@
+wscript.echo   year(date)   &  right( "0"   &   month(date),2)   &   right( "0"   &   day(date),2)  
diff --git a/dev/cosbench-ampli/META-INF/MANIFEST.MF b/dev/cosbench-ampli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cosbench Ampli Client Bundle
 Bundle-SymbolicName: cosbench-ampli
-Bundle-Version: 0.4.1.0
+Bundle-Version: 0.4.7
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: com.intel.cosbench.api.context,

diff --git a/dev/cosbench-ampli/src/com/intel/cosbench/api/amplistor/AmpliStorage.java b/dev/cosbench-ampli/src/com/intel/cosbench/api/amplistor/AmpliStorage.java
@@ -1,5 +1,5 @@
-/** 
- 
+/**
+
 Copyright 2013 Intel Corporation, All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +12,8 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License. 
-*/ 
+limitations under the License.
+*/
 
 package com.intel.cosbench.api.amplistor;
 
@@ -34,9 +34,9 @@
 
 /**
  * The AmpliStor implementation for Storage API.
- * 
+ *
  * @author ywang19, qzheng7
- * 
+ *
  */
 public class AmpliStorage extends NoneStorage {
 
@@ -70,7 +70,7 @@ public void init(Config config, Logger logger) {
         parms.put(TIMEOUT_KEY, timeout);
 
         logger.debug("using storage config: {}", parms);
-        
+
         HttpClient httpClient = HttpClientUtil.createHttpClient(timeout);
         client = new AmpliClient(httpClient, host, port, ns_root);
         logger.debug("ampli client has been initialized");
@@ -89,10 +89,10 @@ public void dispose() {
 
     @Override
     public void abort() {
-    	super.abort();
-    	client.abort();
+        super.abort();
+        client.abort();
     }
-    
+
     @Override
     public InputStream getObject(String container, String object, Config config) {
         super.getObject(container, object, config);

diff --git a/dev/cosbench-ampli/src/com/intel/cosbench/api/amplistor/AmpliStorageFactory.java b/dev/cosbench-ampli/src/com/intel/cosbench/api/amplistor/AmpliStorageFactory.java
@@ -1,5 +1,5 @@
-/** 
- 
+/**
+
 Copyright 2013 Intel Corporation, All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,8 +12,8 @@
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License. 
-*/ 
+limitations under the License.
+*/
 
 package com.intel.cosbench.api.amplistor;