transaction: Replace Cleanup with Done

gluster · May 28, 2018 · 0d145ce · 0d145ce
1 parent 2ff4f66
commit 0d145ce
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 33 deletions.
diff --git a/glusterd2/commands/peers/editpeer.go b/glusterd2/commands/peers/editpeer.go
@@ -41,7 +41,7 @@ func editPeer(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 	lock, unlock, err := transaction.CreateLockSteps(peerID)
 	if err != nil {
 		restutils.SendHTTPError(ctx, w, http.StatusInternalServerError, err)

diff --git a/glusterd2/commands/volumes/bricks-status.go b/glusterd2/commands/volumes/bricks-status.go
@@ -80,7 +80,7 @@ func volumeBricksStatusHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 	txn.Steps = []*transaction.Step{
 		{
 			DoFunc: "bricks-status.Check",

diff --git a/glusterd2/commands/volumes/volume-create.go b/glusterd2/commands/volumes/volume-create.go
@@ -117,7 +117,7 @@ func volumeCreateHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	lock, unlock, err := transaction.CreateLockSteps(req.Name)
 	if err != nil {

diff --git a/glusterd2/commands/volumes/volume-delete.go b/glusterd2/commands/volumes/volume-delete.go
@@ -96,7 +96,7 @@ func volumeDeleteHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	txn.Steps = []*transaction.Step{
 		{

diff --git a/glusterd2/commands/volumes/volume-expand.go b/glusterd2/commands/volumes/volume-expand.go
@@ -93,7 +93,7 @@ func volumeExpandHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	nodes, err := req.Nodes()
 	if err != nil {

diff --git a/glusterd2/commands/volumes/volume-option.go b/glusterd2/commands/volumes/volume-option.go
@@ -182,7 +182,7 @@ func volumeOptionsHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	allNodes, err := peer.GetPeerIDs()
 	if err != nil {

diff --git a/glusterd2/commands/volumes/volume-start.go b/glusterd2/commands/volumes/volume-start.go
@@ -107,7 +107,7 @@ func volumeStartHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	txn.Steps = []*transaction.Step{
 		{

diff --git a/glusterd2/commands/volumes/volume-statedump.go b/glusterd2/commands/volumes/volume-statedump.go
@@ -130,7 +130,7 @@ func volumeStatedumpHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	txn.Steps = []*transaction.Step{
 		{

diff --git a/glusterd2/commands/volumes/volume-stop.go b/glusterd2/commands/volumes/volume-stop.go
@@ -105,7 +105,7 @@ func volumeStopHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	txn.Steps = []*transaction.Step{
 		{

diff --git a/glusterd2/transaction/transaction.go b/glusterd2/transaction/transaction.go
@@ -54,6 +54,7 @@ func NewTxn(ctx context.Context) *Txn {
 	}).WithPrefix(prefix)
 
 	t.Ctx.Logger().Debug("new transaction created")
+	expTxn.Add("initiated_txn_in_progress", 1)
 	return t
 }
 
@@ -71,20 +72,15 @@ func NewTxnWithLocks(ctx context.Context, lockIDs ...string) *Txn {
 	return t
 }
 
-// Cleanup cleans the leftovers after a transaction ends
-func (t *Txn) Cleanup() {
-	store.Store.Delete(context.TODO(), t.Ctx.Prefix(), clientv3.WithPrefix())
-	expTxn.Add("initiated_txn_in_progress", -1)
-}
-
 // Done releases any obtained locks and cleans up the transaction namespace
 // Done must be called after a transaction ends
 func (t *Txn) Done() {
 	// Release obtained locks
 	for _, locker := range t.locks {
 		locker.Unlock(context.Background())
 	}
-	t.Cleanup()
+	store.Store.Delete(context.TODO(), t.Ctx.Prefix(), clientv3.WithPrefix())
+	expTxn.Add("initiated_txn_in_progress", -1)
 }
 
 func (t *Txn) checkAlive() error {
@@ -115,7 +111,6 @@ func (t *Txn) Do() error {
 	}
 
 	t.Ctx.Logger().Debug("Starting transaction")
-	expTxn.Add("initiated_txn_in_progress", 1)
 
 	for i, s := range t.Steps {
 		if s.Skip {

diff --git a/plugins/bitrot/rest.go b/plugins/bitrot/rest.go
@@ -57,7 +57,7 @@ func bitrotEnableHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which starts bitd and scrubber on all nodes.
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	if err := txn.Ctx.Set("volinfo", volinfo); err != nil {
 		logger.WithError(err).Error("failed to set volinfo in transaction context")
@@ -140,7 +140,7 @@ func bitrotDisableHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which stop bitd and scrubber on all nodes.
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	if err := txn.Ctx.Set("volinfo", volinfo); err != nil {
 		logger.WithError(err).Error("failed to set volinfo in transaction context")
@@ -221,7 +221,7 @@ func bitrotScrubOndemandHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which starts scrubber on demand.
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	//Lock on Volume Name
 	lock, unlock, err := transaction.CreateLockSteps(volName)
@@ -288,7 +288,7 @@ func bitrotScrubStatusHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which gets scrubber status.
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	//Lock on Volume Name
 	lock, unlock, err := transaction.CreateLockSteps(volName)

diff --git a/plugins/device/rest.go b/plugins/device/rest.go
@@ -71,7 +71,7 @@ func deviceAddHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	txn.Nodes = []uuid.UUID{peerInfo.ID}
 	txn.Steps = []*transaction.Step{

diff --git a/plugins/georeplication/rest.go b/plugins/georeplication/rest.go
@@ -160,7 +160,7 @@ func georepCreateHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which updates the Geo-rep session
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	// Lock on Master Volume name
 	lock, unlock, err := transaction.CreateLockSteps(geoSession.MasterVol)
@@ -292,7 +292,7 @@ func georepActionHandler(w http.ResponseWriter, r *http.Request, action actionTy
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	lock, unlock, err := transaction.CreateLockSteps(geoSession.MasterVol)
 	if err != nil {
@@ -424,7 +424,7 @@ func georepDeleteHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	lock, unlock, err := transaction.CreateLockSteps(geoSession.MasterVol)
 	if err != nil {
@@ -514,7 +514,7 @@ func georepStatusHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Status Transaction
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	txn.Nodes = vol.Nodes()
 	txn.Steps = []*transaction.Step{
@@ -785,7 +785,7 @@ func georepConfigSetHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 	// TODO: change the lock key
 	lock, unlock, err := transaction.CreateLockSteps(geoSession.MasterVol)
 	if err != nil {
@@ -927,7 +927,7 @@ func georepConfigResetHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 	// TODO: change the lock key
 	lock, unlock, err := transaction.CreateLockSteps(geoSession.MasterVol)
 	if err != nil {
@@ -1024,7 +1024,7 @@ func georepSSHKeyGenerateHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which updates the Geo-rep session
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	// Lock on Master Volume name
 	lock, unlock, err := transaction.CreateLockSteps(volname)
@@ -1120,7 +1120,7 @@ func georepSSHKeyPushHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which updates the Geo-rep session
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	// Lock on Master Volume name
 	lock, unlock, err := transaction.CreateLockSteps(volname)

diff --git a/plugins/glustershd/rest.go b/plugins/glustershd/rest.go
@@ -58,7 +58,7 @@ func glustershEnableHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Transaction which starts self heal daemon on all nodes with atleast one brick.
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	//Lock on Volume Name
 	lock, unlock, err := transaction.CreateLockSteps(volname)
@@ -140,7 +140,7 @@ func glustershDisableHandler(w http.ResponseWriter, r *http.Request) {
 	// Transaction which checks if all replicate volumes are stopped before
 	// stopping the self-heal daemon.
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	// Lock on volume name.
 	lock, unlock, err := transaction.CreateLockSteps(volname)

diff --git a/plugins/quota/rest.go b/plugins/quota/rest.go
@@ -74,7 +74,7 @@ func quotaEnableHandler(w http.ResponseWriter, r *http.Request) {
 	vol.Options[quotaEnabledKey] = "on"
 
 	txn := transaction.NewTxn(ctx)
-	defer txn.Cleanup()
+	defer txn.Done()
 
 	if err := txn.Ctx.Set("volinfo", vol); err != nil {
 		logger.WithError(err).Error("failed to set volinfo in transaction context")