From: Steve Singer <ssinger@ca.afilias.info>
Date: Tue, 13 May 2014 13:49:37 +0000 (-0400)
Subject: fixing generate load origin node parameter mismatch
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=f89eb4a7ce83678cb71c64276d364d648247faf6;p=slony1-engine.git

fixing generate load origin node parameter mismatch
---

diff --git a/clustertest/disorder/tests/BasicTest.js b/clustertest/disorder/tests/BasicTest.js
index 3dd84d41..7abb6080 100644
--- a/clustertest/disorder/tests/BasicTest.js
+++ b/clustertest/disorder/tests/BasicTest.js
@@ -587,8 +587,9 @@ BasicTest.prototype.teardownSlony = function() {
 
 
 
-BasicTest.prototype.generateLoad = function(set_origin) {
+BasicTest.prototype.generateLoad = function() {
 
+	var set_origin = this.getCurrentOrigin();
     this.coordinator.log("BasicTest.prototype.generateLoad - origin[" + set_origin + "] - start");
 	var disorderClientJs = this.coordinator.readFile('disorder/client/disorder.js');
 	disorderClientJs+= this.coordinator.readFile('disorder/client/run_fixed_load.js');
diff --git a/clustertest/disorder/tests/BulkAddingTest.js b/clustertest/disorder/tests/BulkAddingTest.js
index 9cd60ba6..d47a2e41 100644
--- a/clustertest/disorder/tests/BulkAddingTest.js
+++ b/clustertest/disorder/tests/BulkAddingTest.js
@@ -95,7 +95,7 @@ BulkAddingTest.prototype.runTest = function() {
 	 * run some load through the system to make sure
 	 * everything replicates as expected.
 	 */
-	var populate=this.generateLoad('db1');
+	var populate=this.generateLoad();
 	this.subscribeSet(1,1,1,[3]);
 	java.lang.Thread.sleep(3*1000);
 	populate.stop();
diff --git a/clustertest/disorder/tests/MultinodeFailover.js b/clustertest/disorder/tests/MultinodeFailover.js
index f3f1d48a..ae94a26d 100644
--- a/clustertest/disorder/tests/MultinodeFailover.js
+++ b/clustertest/disorder/tests/MultinodeFailover.js
@@ -47,7 +47,7 @@ MultinodeFailover.prototype.runTest = function() {
 	this.slonikSync(1,1);
 	this.createSecondSet(2);
 	this.subscribeSet(2,2,2,[3,4,5]);
-	this.slonikSync(2,2);
+	this.slonikSync(2,2);	
 	var load = this.generateLoad();
 	java.lang.Thread.sleep(10*1000);
 	this.slonikSync(1,1);
@@ -149,6 +149,7 @@ MultinodeFailover.prototype.runTest = function() {
 	slonik.run();
 	this.coordinator.join(slonik);
 	this.testResults.assertCheck('failover passes',slonik.getReturnCode(),0);	
+	this.currentOrigin='db2';
 	load=this.generateLoad();
 	java.lang.Thread.sleep(1000);
 	/**
diff --git a/clustertest/disorder/tests/MultipleOrigins.js b/clustertest/disorder/tests/MultipleOrigins.js
index 0caab59b..9a7bcf2d 100644
--- a/clustertest/disorder/tests/MultipleOrigins.js
+++ b/clustertest/disorder/tests/MultipleOrigins.js
@@ -64,7 +64,7 @@ MultipleOrigins.prototype.runTest = function() {
 	 *  
 	 *  where set 1 is origin on 1, set 2 is origin on 2.
 	 */
-	var load = this.generateLoad(1);
+	var load = this.generateLoad();
 	java.lang.Thread.sleep(10*1000);
 	load.stop();
 	this.coordinator.join(load);
@@ -78,7 +78,7 @@ MultipleOrigins.prototype.runTest = function() {
 	 */	
 	this.moveSet(1,1,4);
 	this.currentOrigin='db4';
-	load = this.generateLoad(4);
+	load = this.generateLoad();
 	java.lang.Thread.sleep(10*1000);
 	load.stop();
 	this.coordinator.join(load);
@@ -91,7 +91,7 @@ MultipleOrigins.prototype.runTest = function() {
 	this.slonikSync(1,1);
 	this.slonikSync(1,4);
 	this.failNode(1,4,true);
-	load = this.generateLoad(4);
+	load = this.generateLoad();
 	java.lang.Thread.sleep(10*1000);
 	load.stop();
 	this.coordinator.join(load);
diff --git a/clustertest/disorder/tests/SiteFailover.js b/clustertest/disorder/tests/SiteFailover.js
index 087b6d6a..2ec1afad 100644
--- a/clustertest/disorder/tests/SiteFailover.js
+++ b/clustertest/disorder/tests/SiteFailover.js
@@ -17,7 +17,7 @@ SiteFailover.prototype.getNodeCount = function() {
 
 SiteFailover.prototype.runTest = function() {
     this.coordinator.log("SiteFailover.prototype.runTest - begin");
-    this.testResults.newGroup("Multinode Fail Over Test");
+    this.testResults.newGroup("Site Fail Over Test");
     basicTest.prepareDb(['db6']);
     this.setupReplication();
     
@@ -95,7 +95,7 @@ SiteFailover.prototype.runTest = function() {
     this.subscribeSet(2,3,3,[1,4,5]);
     this.subscribeSet(2,3,5,[2,6]);
     this.slonikSync(1,1);
-    var load = this.generateLoad(1);
+    var load = this.generateLoad();
     java.lang.Thread.sleep(10*1000);
     this.slonikSync(1,1);
     this.populateReviewTable(2);
@@ -123,13 +123,15 @@ SiteFailover.prototype.runTest = function() {
 	slonik.run();
 	this.coordinator.join(slonik);
 	this.testResults.assertCheck('drop 3 nodes passes',slonik.getReturnCode(),0);	
-    
-	load = this.generateLoad(2);
+    this.currentOrigin='db2';
+	load = this.generateLoad();
     java.lang.Thread.sleep(10*1000);
+	load.stop();
+	this.coordinator.join(load);
     this.slonikSync(1,2);
     this.slonikSync(2,5);
     
-
+	
     for ( var idx = 1; idx <= this.getNodeCount(); idx++) {
 	this.slonArray[idx - 1].stop();
 	this.coordinator.join(this.slonArray[idx - 1]);