Removed unused concurrent core code

Author: clintonk

core/concurrent_core.go

@@ -49,10 +49,7 @@ type ConcurrentTridentOrchestrator struct {
 	scPoolMap      *storageclass.PoolMap
 	scPoolMapMutex *sync.RWMutex
 
-	txnMutex          *locks.GCNamedMutex
-	txnMonitorTicker  *time.Ticker
-	txnMonitorChannel chan struct{}
-	txnMonitorStopped bool
+	txnMutex *locks.GCNamedMutex
 
 	lastNodeRegistrationMutex *sync.RWMutex
 	lastNodeRegistrationTime  time.Time
@@ -163,7 +160,7 @@ func (o *ConcurrentTridentOrchestrator) transformPersistentState(ctx context.Con
 	return nil
 }
 
-func (o *ConcurrentTridentOrchestrator) Bootstrap(monitorTransactions bool) error {
+func (o *ConcurrentTridentOrchestrator) Bootstrap(_ bool) error {
 	ctx := GenerateRequestContext(nil, "", ContextSourceInternal, WorkflowCoreBootstrap, LogLayerCore)
 	var err error
 
@@ -189,12 +186,6 @@ func (o *ConcurrentTridentOrchestrator) Bootstrap(monitorTransactions bool) erro
 		return o.bootstrapError
 	}
 
-	// TODO (cknight): reenable
-	// if monitorTransactions {
-	//	// Start transaction monitor
-	//	o.StartTransactionMonitor(ctx, txnMonitorPeriod, txnMonitorMaxAge)
-	// }
-
 	o.bootstrapped = true
 	o.bootstrapError = nil
 	Logc(ctx).Infof("%s bootstrapped successfully.", convert.ToTitle(config.OrchestratorName))
@@ -684,10 +675,6 @@ func (o *ConcurrentTridentOrchestrator) Stop() {
 	if o.stopReconcileBackendLoop != nil {
 		o.stopReconcileBackendLoop <- true
 	}
-
-	// TODO (cknight): reenable
-	// // Stop transaction monitor
-	// o.StopTransactionMonitor()
 }
 
 // validateAndCreateBackendFromConfig validates config and creates backend based on Config

core/transaction_monitor.go

@@ -160,157 +160,3 @@ func (o *TridentOrchestrator) reapLongRunningTransaction(ctx context.Context, tx
 		}).Error("Could not delete expired transaction. Transaction record may have to be removed manually.")
 	}
 }
-
-////////////
-// COREV2 //
-////////////
-
-// StartTransactionMonitor starts the thread that reaps abandoned long-running transactions.
-//func (o *ConcurrentTridentOrchestrator) StartTransactionMonitor(
-//	ctx context.Context, txnPeriod, txnMaxAge time.Duration,
-//) {
-//	ctx = GenerateRequestContextForLayer(ctx, LogLayerCore)
-//
-//	o.txnMonitorTicker = time.NewTicker(txnPeriod)
-//	o.txnMonitorChannel = make(chan struct{})
-//	Logc(ctx).Debug("Transaction monitor started.")
-//
-//	// Perform the check once and run it in a goroutine for every tick
-//	o.checkLongRunningTransactions(ctx, txnMaxAge)
-//	go func() {
-//		for {
-//			select {
-//			case tick := <-o.txnMonitorTicker.C:
-//				Logc(ctx).WithField("tick", tick).Debug("Transaction monitor running.")
-//				o.checkLongRunningTransactions(ctx, txnMaxAge)
-//			case <-o.txnMonitorChannel:
-//				Logc(ctx).Debugf("Transaction monitor stopped.")
-//				return
-//			}
-//		}
-//	}()
-//}
-//
-//// StopTransactionMonitor stops the thread that reaps abandoned long-running transactions.
-//func (o *ConcurrentTridentOrchestrator) StopTransactionMonitor() {
-//	if o.txnMonitorTicker != nil {
-//		o.txnMonitorTicker.Stop()
-//	}
-//	if o.txnMonitorChannel != nil && !o.txnMonitorStopped {
-//		close(o.txnMonitorChannel)
-//		o.txnMonitorStopped = true
-//	}
-//	Logc(context.Background()).Debug("Transaction monitor stopped.")
-//}
-//
-//// checkLongRunningTransactions is called periodically by the transaction monitor to
-//// see if any long-running transactions exist that have expired and must be reaped.
-//func (o *ConcurrentTridentOrchestrator) checkLongRunningTransactions(ctx context.Context, txnMaxAge time.Duration) {
-//	if o.bootstrapError != nil {
-//		Logc(ctx).WithField("error", o.bootstrapError).Errorf("Transaction monitor blocked by bootstrap error.")
-//		return
-//	}
-//
-//	txns, err := o.storeClient.GetVolumeTransactions(ctx)
-//	if err != nil {
-//		if !persistentstore.MatchKeyNotFoundErr(err) {
-//			Logc(ctx).WithField("error", err).Errorf("Could not read transactions.")
-//		}
-//		return
-//	}
-//	Log().Debugf("Transaction monitor found %d long-running transaction(s).", len(txns))
-//
-//	// Build map of long-running transactions
-//	txnMap := make(map[*storage.VolumeTransaction]time.Time)
-//
-//	for _, txn := range txns {
-//		switch txn.Op {
-//		case storage.VolumeCreating:
-//			txnMap[txn] = txn.VolumeCreatingConfig.StartTime
-//		default:
-//			continue
-//		}
-//	}
-//
-//	// Reap each long-running transaction that has expired
-//	for txn, startTime := range txnMap {
-//		expirationTime := startTime.Add(txnMaxAge)
-//		Logc(ctx).WithFields(LogFields{
-//			"started": startTime,
-//			"expires": expirationTime,
-//			"op":      txn.Op,
-//			"name":    txn.Name(),
-//		}).Debug("Transaction monitor checking transaction.")
-//
-//		if expirationTime.Before(time.Now()) {
-//			o.reapLongRunningTransaction(ctx, txn)
-//		}
-//	}
-//}
-//
-//// reapLongRunningTransaction cleans up any transactions that have expired so that any
-//// storage resources associated with them are not orphaned indefinitely.
-//func (o *ConcurrentTridentOrchestrator) reapLongRunningTransaction(ctx context.Context, txn *storage.VolumeTransaction) {
-//	// o.mutex.Lock()
-//	// defer o.mutex.Unlock()
-//
-//	Logc(ctx).WithFields(LogFields{
-//		"op":   txn.Op,
-//		"name": txn.Name(),
-//	}).Debug("Transaction monitor reaping transaction.")
-//
-//	// Clean up any resources associated with the transaction.
-//	switch txn.Op {
-//	case storage.VolumeCreating:
-//		// If the volume was somehow fully created and the transaction was left around, don't delete the volume!
-//		if o.cache.CheckVolume(txn.VolumeCreatingConfig.Name) {
-//			Logc(ctx).WithFields(LogFields{
-//				"volume": txn.VolumeCreatingConfig.Name,
-//			}).Warning("Volume for expired transaction is known to Trident and will not be reaped.")
-//			break
-//		}
-//
-//		// Get the backend where this abandoned volume may still exist
-//		if !o.cache.CheckBackendByUUID(txn.VolumeCreatingConfig.BackendUUID) {
-//			Logc(ctx).WithFields(LogFields{
-//				"backendUUID": txn.VolumeCreatingConfig.BackendUUID,
-//				"volume":      txn.VolumeCreatingConfig.Name,
-//			}).Error("Backend for expired transaction not found. Volume may have to be removed manually.")
-//			break
-//		}
-//
-//		// TODO: If the caller already invokes backend locks, don't do this.
-//		backend, cacheUpdateBackendFunc, cacheUpdateBackendUnlocker, err := o.cache.PrepareUpdateBackend(txn.VolumeCreatingConfig.BackendUUID)
-//		if err != nil {
-//			Logc(ctx).WithFields(LogFields{
-//				"backendUUID": txn.VolumeCreatingConfig.BackendUUID,
-//				"volume":      txn.VolumeCreatingConfig.Name,
-//				"err":         err,
-//			}).Error("Backend for expired transaction not found. Volume may have to be removed manually.")
-//			break
-//		}
-//
-//		// Delete the volume.  This should be safe since the transaction was left around and Trident doesn't
-//		// know anything about the volume.
-//		if err := backend.RemoveVolume(ctx, &txn.VolumeCreatingConfig.VolumeConfig); err != nil {
-//			Logc(ctx).WithFields(LogFields{
-//				"backendUUID": txn.VolumeCreatingConfig.BackendUUID,
-//				"volume":      txn.VolumeCreatingConfig.Name,
-//				"error":       err,
-//			}).Error("Volume for expired transaction not deleted. Volume may have to be removed manually.")
-//			break
-//		}
-//		cacheUpdateBackendFunc(backend)
-//		cacheUpdateBackendUnlocker()
-//	default:
-//		break
-//	}
-//
-//	// Delete the transaction record in all cases.
-//	if err := o.DeleteVolumeTransaction(ctx, txn); err != nil {
-//		Logc(ctx).WithFields(LogFields{
-//			"op":   txn.Op,
-//			"name": txn.Name(),
-//		}).Error("Could not delete expired transaction. Transaction record may have to be removed manually.")
-//	}
-//}