From a9c0b5e342a9fbd44caf13e3ed4bce3c8346bc81 Mon Sep 17 00:00:00 2001
From: Andrey Kurilov <andrey.kurilov@emc.com>
Date: Fri, 13 Jan 2017 23:31:20 +0300
Subject: [PATCH] save

---
 .../emc/mongoose/common/net/ServiceUtil.java  |   8 --
 scenario/misc/sanity.json                     | 100 +++++++++++-------
 2 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/common/src/main/java/com/emc/mongoose/common/net/ServiceUtil.java b/common/src/main/java/com/emc/mongoose/common/net/ServiceUtil.java
index 99b37b197b..5d853df1fb 100644
--- a/common/src/main/java/com/emc/mongoose/common/net/ServiceUtil.java
+++ b/common/src/main/java/com/emc/mongoose/common/net/ServiceUtil.java
@@ -109,9 +109,6 @@ public static String create(final Service svc, final int port) {
 				if(!SVC_MAP.containsKey(svcUri)) {
 					Naming.rebind(svcUri, svc);
 					SVC_MAP.put(svcName, svc);
-					System.out.println(
-						"Registered new service \"" + svcName + "\", total count: " + SVC_MAP.size()
-					);
 				} else {
 					throw new IllegalStateException("Service already registered");
 				}
@@ -153,11 +150,6 @@ public static String close(final Service svc)
 						System.err.println(
 							"Failed to remove the service \"" + svcName + "\""
 						);
-					} else {
-						System.out.println(
-							"Removed the service \"" + svcName + "\", total count: " +
-							SVC_MAP.size()
-						);
 					}
 				}
 			} catch(final NotBoundException | URISyntaxException e) {
diff --git a/scenario/misc/sanity.json b/scenario/misc/sanity.json
index 6805156e2b..fb11a0b142 100644
--- a/scenario/misc/sanity.json
+++ b/scenario/misc/sanity.json
@@ -1,20 +1,11 @@
 {
-	"type" : "for",
+	"type" : "parallel",
 	"config" : {
 		"item" : {
-			"data" : {
-				"size" : "10KB"
-			},
 			"output" : {
 				"path" : "/default"
 			}
 		},
-		"load" : {
-			"concurrency" : 10,
-			"limit" : {
-				"time" : 20
-			}
-		},
 		"storage" : {
 			"driver" : {
 				"remote" : true
@@ -26,51 +17,82 @@
 			"type" : "load",
 			"config" : {
 				"item" : {
-					"output" : {
-						"file" : "items.csv"
+					"data" : {
+						"size" : "10KB"
 					}
+				},
+				"load" : {
+					"concurrency" : 100
 				}
 			}
 		},
 		{
-			"type" : "load",
+			"type" : "for",
 			"config" : {
 				"item" : {
 					"data" : {
-						"verify" : true
-					},
-					"input" : {
-						"file" : "items.csv"
+						"size" : "1KB"
 					}
 				},
 				"load" : {
-					"circular" : true,
-					"type" : "read"
+					"concurrency" : 10,
+					"limit" : {
+						"time" : 10
+					}
 				}
-			}
-		},
-		{
-			"type" : "load",
-			"config" : {
-				"item" : {
-					"data" : {
-						"ranges" : {
-							"random" : 1
+			},
+			"jobs" : [
+				{
+					"type" : "load",
+					"config" : {
+						"item" : {
+							"output" : {
+								"file" : "items.csv"
+							}
 						}
-					},
-					"input" : {
-						"file" : "items.csv"
 					}
 				},
-				"load" : {
-					"circular" : true,
-					"type" : "update"
+				{
+					"type" : "load",
+					"config" : {
+						"item" : {
+							"data" : {
+								"verify" : true
+							},
+							"input" : {
+								"file" : "items.csv"
+							}
+						},
+						"load" : {
+							"circular" : true,
+							"type" : "read"
+						}
+					}
+				},
+				{
+					"type" : "load",
+					"config" : {
+						"item" : {
+							"data" : {
+								"ranges" : {
+									"random" : 1
+								}
+							},
+							"input" : {
+								"file" : "items.csv"
+							}
+						},
+						"load" : {
+							"circular" : true,
+							"type" : "update"
+						}
+					}
+				},
+				{
+					"type" : "command",
+					"value" : "rm -f items.csv"
 				}
-			}
-		},
-		{
-			"type" : "command",
-			"value" : "rm -f items.csv"
+			]
 		}
 	]
 }