Merge branch 'master' into ppc64le_build

openebs-archive · Mar 9, 2020 · c7676df · c7676df
2 parents 090e825 + b620bdc
commit c7676df
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/app/controller.go b/app/controller.go
@@ -124,10 +124,10 @@ func startController(c *cli.Context) error {
 	}
 	logrus.Infof("Starting controller with frontendIP: %v, and clusterIP: %v", tgt.FrontendIP, tgt.ClusterIP)
 
-	startAutoSnapDeletion := make(chan bool)
+	//startAutoSnapDeletion := make(chan bool)
 	control := controller.
 		NewController(
-			startAutoSnapDeletion,
+			//		startAutoSnapDeletion,
 			controller.WithName(name),
 			controller.WithClusterIP(tgt.ClusterIP),
 			controller.WithBackend(dynamic.New(
@@ -136,11 +136,11 @@ func startController(c *cli.Context) error {
 			controller.WithRF(int(rf)))
 	server := rest.NewServer(control)
 	router := http.Handler(rest.NewRouter(server))
-	go func(c *controller.Controller) {
-		for <-startAutoSnapDeletion {
-			go autoDeleteSnapshot(c)
-		}
-	}(control)
+	//	go func(c *controller.Controller) {
+	//		for <-startAutoSnapDeletion {
+	//			go autoDeleteSnapshot(c)
+	//		}
+	//	}(control)
 
 	router = util.FilteredLoggingHandler(map[string]struct{}{
 		"/v1/volumes":  {},
@@ -252,6 +252,6 @@ func autoDeleteSnapshot(c *controller.Controller) error {
 	// if no of snapshots are greater than 10
 	// this function will start deleting the snapshots
 	// but if it's less then 10 goroutine will be exited
-	c.StartAutoSnapDeletion <- true
+	//c.StartAutoSnapDeletion <- true
 	return nil
 }
diff --git a/ci/start_init_test.sh b/ci/start_init_test.sh
@@ -2079,7 +2079,7 @@ fi
 
 # currently integration tests are run only for amd64
 if [ "$ARCH" != "linux_amd64" ]; then
-  echo "skipping test for $ARCH" 
+  echo "skipping test for $ARCH"
   exit 0
 fi
 
@@ -2102,10 +2102,10 @@ test_restart_during_prepare_rebuild
 test_preload
 test_replica_rpc_close
 test_controller_rpc_close
-test_replication_factor
+#test_replication_factor
 #test_two_replica_delete
-test_replica_ip_change
-test_replica_reregistration
+#test_replica_ip_change
+#test_replica_reregistration
 run_data_integrity_test_with_fs_creation
 test_clone_feature
 test_duplicate_snapshot_failure

diff --git a/controller/control.go b/controller/control.go
@@ -38,7 +38,7 @@ type Controller struct {
 	ReadOnly                 bool
 	SnapshotName             string
 	IsSnapDeletionInProgress bool
-	StartAutoSnapDeletion    chan bool
+	//StartAutoSnapDeletion    chan bool
 }
 
 func max(x int, y int) int {
@@ -98,13 +98,13 @@ func WithClusterIP(ip string) BuildOpts {
 }
 
 // NewController instantiates a new Controller
-func NewController(ch chan bool, opts ...BuildOpts) *Controller {
+func NewController(opts ...BuildOpts) *Controller {
 	c := &Controller{
 		RegisteredReplicas:       map[string]types.RegReplica{},
 		RegisteredQuorumReplicas: map[string]types.RegReplica{},
 		StartTime:                time.Now(),
 		ReadOnly:                 true,
-		StartAutoSnapDeletion:    ch,
+		//StartAutoSnapDeletion:    ch,
 	}
 
 	for _, o := range opts {

diff --git a/controller/rebuild.go b/controller/rebuild.go
@@ -113,7 +113,7 @@ func (c *Controller) VerifyRebuildReplica(address string) error {
 		c.quorumReplicaCount = len(c.quorumReplicas)
 	}
 	c.UpdateVolStatus()
-	c.StartAutoSnapDeletion <- true
+	//c.StartAutoSnapDeletion <- true
 	return nil
 }
 

diff --git a/sync/sync.go b/sync/sync.go
@@ -388,16 +388,16 @@ func (t *Task) syncFiles(fromClient, toClient *replicaClient.ReplicaClient, disk
 			return fmt.Errorf("Disk list shouldn't contain volume-head")
 		}
 
-		ok, err := isRevisionCountSame(fromClient, toClient, disk)
-		if err != nil {
+		/*		ok, err := isRevisionCountSame(fromClient, toClient, disk)
+				if err != nil {
+					return err
+				}
+		*/
+		//		if !ok {
+		if err := t.syncFile(disk, "", fromClient, toClient); err != nil {
 			return err
 		}
-
-		if !ok {
-			if err := t.syncFile(disk, "", fromClient, toClient); err != nil {
-				return err
-			}
-		}
+		//		}
 		if err := t.syncFile(disk+".meta", "", fromClient, toClient); err != nil {
 			return err
 		}