Rename transactionv2 to transaction

This commit does 3 things,

1. Move required types and functions from the old transaction package to
the transactionv2 package.
2. Remove the old transaction package.
3. Rename the transactionv2 package to transaction

Author: kshlm

glusterd2/commands/peers/peer-rpc-svc.go

@@ -8,8 +8,8 @@ import (
 	"github.com/gluster/glusterd2/glusterd2/peer"
 	"github.com/gluster/glusterd2/glusterd2/servers/peerrpc"
 	"github.com/gluster/glusterd2/glusterd2/store"
-	"github.com/gluster/glusterd2/glusterd2/transactionv2"
-	"github.com/gluster/glusterd2/glusterd2/transactionv2/cleanuphandler"
+	"github.com/gluster/glusterd2/glusterd2/transaction"
+	"github.com/gluster/glusterd2/glusterd2/transaction/cleanuphandler"
 	"github.com/gluster/glusterd2/glusterd2/volume"
 	"github.com/gluster/glusterd2/pkg/utils"
 

glusterd2/commands/volumes/volume-create.go

@@ -11,7 +11,6 @@ import (
 	"github.com/gluster/glusterd2/glusterd2/gdctx"
 	restutils "github.com/gluster/glusterd2/glusterd2/servers/rest/utils"
 	"github.com/gluster/glusterd2/glusterd2/transaction"
-	transactionv2 "github.com/gluster/glusterd2/glusterd2/transactionv2"
 	"github.com/gluster/glusterd2/glusterd2/volume"
 	"github.com/gluster/glusterd2/pkg/api"
 	gderrors "github.com/gluster/glusterd2/pkg/errors"
@@ -175,7 +174,7 @@ func volumeCreateHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	txn, err := transactionv2.NewTxnWithLocks(ctx, req.Name)
+	txn, err := transaction.NewTxnWithLocks(ctx, req.Name)
 	if err != nil {
 		status, err := restutils.ErrToStatusCode(err)
 		restutils.SendHTTPError(ctx, w, status, err)

glusterd2/main.go

@@ -16,8 +16,8 @@ import (
 	"github.com/gluster/glusterd2/glusterd2/pmap"
 	"github.com/gluster/glusterd2/glusterd2/servers"
 	"github.com/gluster/glusterd2/glusterd2/store"
-	"github.com/gluster/glusterd2/glusterd2/transactionv2"
-	"github.com/gluster/glusterd2/glusterd2/transactionv2/cleanuphandler"
+	"github.com/gluster/glusterd2/glusterd2/transaction"
+	"github.com/gluster/glusterd2/glusterd2/transaction/cleanuphandler"
 	gdutils "github.com/gluster/glusterd2/glusterd2/utils"
 	"github.com/gluster/glusterd2/glusterd2/volgen"
 	"github.com/gluster/glusterd2/glusterd2/xlator"

…tionv2/cleanuphandler/cleanup_handler.go …action/cleanuphandler/cleanup_handler.goglusterd2/transactionv2/cleanuphandler/cleanup_handler.go renamed to glusterd2/transaction/cleanuphandler/cleanup_handler.go glusterd2/transactionv2/cleanuphandler/cleanup_handler.go renamed to glusterd2/transaction/cleanuphandler/cleanup_handler.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/gluster/glusterd2/glusterd2/gdctx"
 	"github.com/gluster/glusterd2/glusterd2/store"
-	"github.com/gluster/glusterd2/glusterd2/transactionv2"
+	"github.com/gluster/glusterd2/glusterd2/transaction"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"

glusterd2/transaction/context.go

@@ -14,8 +14,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const etcdTxnTimeout = 10
-
 // TxnCtx is used to carry contextual information across the lifetime of a transaction
 type TxnCtx interface {
 	// Set attaches the given key with value to the context. It updates value if key exists already.
@@ -139,7 +137,7 @@ func (c *Tctx) Commit() error {
 		return err
 	}
 
-	expTxn.Add("txn_ctx_store_commit", 1)
+	//expTxn.Add("txn_ctx_store_commit", 1)
 
 	c.writeSet = make(map[string]string)
 	c.readCacheDirty = true
@@ -208,7 +206,7 @@ func (c *Tctx) Delete(key string) error {
 			"failed to delete key")
 		return err
 	}
-	expTxn.Add("txn_ctx_store_delete", 1)
+	//expTxn.Add("txn_ctx_store_delete", 1)
 	return nil
 }