xMerge branch 'develop' of github.com:signal18/replication-manager into develop

Author: eloubersac

cluster/cluster_set.go

@@ -907,6 +907,15 @@ func (cluster *Cluster) SetClusterHead(ClusterName string) {
 	cluster.Conf.ClusterHead = ClusterName
 }
 
+func (cluster *Cluster) SetSysbenchThreads(Threads string) {
+	i, err := strconv.Atoi(Threads)
+	if err == nil {
+		cluster.Conf.SysbenchThreads = i
+	} else {
+		cluster.LogPrintf(LvlErr, "Error converting threads to int %s", err)
+	}
+}
+
 func (cluster *Cluster) SetServicePlan(theplan string) error {
 	plans := cluster.GetServicePlans()
 	for _, plan := range plans {

etc/opensvc/cluster-api/cluster-demo/stephane.d/mysql80.toml.no

@@ -1638,6 +1638,10 @@ func (repman *ReplicationManager) handlerMuxClusterSysbench(w http.ResponseWrite
 			http.Error(w, "No valid ACL", 403)
 			return
 		}
+		if r.URL.Query().Get("threads") != "" {
+			mycluster.LogPrintf(cluster.LvlInfo, "Setting Sysbench threads to %s", r.URL.Query().Get("threads"))
+			mycluster.SetSysbenchThreads(r.URL.Query().Get("threads"))
+		}
 		go mycluster.RunSysbench()
 	}
 	return

server/api_cluster.go

@@ -1150,8 +1150,8 @@ function (
       };
 
 
-      $scope.sysbench = function () {
-        if (confirm("Confirm sysbench run !")) httpGetWithoutResponse(getClusterUrl() + '/actions/sysbench');
+      $scope.sysbench = function (threads) {
+        if (confirm("Confirm sysbench run !"+ threads)) httpGetWithoutResponse(getClusterUrl() + '/actions/sysbench?threads='+threads);
       };
 
       $scope.runonetest = function (test) {
@@ -1532,7 +1532,7 @@ function (
       };
 
 
-      
+
 
       $scope.openCluster = function (clusterName) {
         $timeout.cancel( $scope.promise);
@@ -1621,11 +1621,11 @@ function (
           //  $scope.callServices();
           //  $scope.setClusterCredentialDialog();
           }
-        
+
           $mdSidenav('right').close();
           $scope.menuOpened = false;
-        
-        
+
+
       };
       $scope.deleteClusterDialog = function () {
         $scope.menuOpened = true;
@@ -1638,7 +1638,7 @@ function (
            //    escapeToClose: false,
          });
        };
-      
+
       $scope.cancelNewClusterDialog = function () {
         $mdDialog.hide({contentElement: '#myNewClusterDialog',});
         $mdSidenav('right').close();
@@ -1699,7 +1699,7 @@ function (
           escapeToClose: false,
         });
       };
-      
+
       $scope.closeClusterCredentialDialog = function (user,pass) {
         $mdDialog.hide({contentElement: '#myClusterCredentialDialog',});
         if (confirm("Confirm set user/password")) httpGetWithoutResponse(getClusterUrl() + '/settings/actions/set/db-servers-credential/' + user + ':' + pass);

share/dashboard/app/dashboard.js

@@ -14,12 +14,23 @@
                                ng-repeat="element in settings.tests" value="{{element}}">{{element}}</md-option>
                 </md-select>
           </td> <td>
+
               <md-button type="button" class="btn btn-primary" ng-click="test()">Run Tests</md-button>
           </td>
         </tr>
         <tr>
-          <td colspan=3>
-              <md-button type="button" class="btn btn-primary" ng-click="sysbench()">Sysbench</md-button>
+          <td >
+            <md-select name="selectedThreads" id="selectedThreads" ng-model="selectedThreads" >
+                <md-option ng-value="1" ng-selected="{{element == selectedCluster.config.sysbenchThreads}}" > 1 </md-option>
+                  <md-option ng-value="4" ng-selected="{{element == selectedCluster.config.sysbenchThreads}}"> 4 </md-option>
+                  <md-option ng-value="8" ng-selected="{{element == selectedCluster.config.sysbenchThreads}}" > 8 </md-option>
+                    <md-option ng-value="16" ng-selected="{{element == selectedCluster.config.sysbenchThreads}}"> 16 </md-option>
+                      <md-option ng-value="32" ng-selected="{{element == selectedCluster.config.sysbenchThreads}}"> 32 </md-option>
+                          <md-option ng-value="64" ng-selected="{{element == selectedCluster.config.sysbenchThreads}}"> 64 </md-option>
+                          <md-option ng-value="128" ng-selected="{{element == selectedCluster.config.sysbenchThreads}}"> 128 </md-option>
+            </md-select>
+            </td><td colspan=2>
+              <md-button type="button" class="btn btn-primary" ng-click="sysbench(selectedThreads)">Sysbench</md-button>
           </td>
         </tr>
         <tr>