Fix typos in log line. Add additional code comments.

Author: davis-haba

go.mod

@@ -13,6 +13,7 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
 	github.com/googleapis/gax-go/v2 v2.12.4
+	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/kubernetes-csi/csi-proxy/client v1.1.3
 	github.com/kubernetes-csi/csi-test/v5 v5.3.0
 	github.com/onsi/ginkgo/v2 v2.20.1
@@ -76,7 +77,6 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.0 // indirect
-	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

pkg/gce-pd-csi-driver/device_error_map.go

@@ -46,14 +46,17 @@ func newDeviceErrMap(timeout time.Duration) *deviceErrMap {
 	}
 }
 
-// checkDeviceErrorTimeout returns true an error was encountered for the specified deviceName,
-// where the error happened at least `deviceInUseTimeout` seconds ago.
-func (devErrMap *deviceErrMap) checkDeviceErrorTimeout(deviceName string) bool {
+// deviceErrorExpired returns true if an error for the specified device is expired,
+// where the expiration is specified by `--device-in-use-timeout`
+func (devErrMap *deviceErrMap) deviceErrorExpired(deviceName string) bool {
 	devErrMap.mux.Lock()
 	defer devErrMap.mux.Unlock()
 
 	firstEncounteredErrTime, exists := devErrMap.cache.Get(deviceName)
 	if !exists {
+		// If the deviceName does not exist in the map, then this is the first time
+		// an error was encountered for that device. We return false since it cannot be
+		// expired yet.
 		return false
 	}
 	expirationTime := firstEncounteredErrTime.Add(devErrMap.timeout)

pkg/gce-pd-csi-driver/device_error_map_test.go

@@ -28,17 +28,24 @@ func TestDeviceErrorMap(t *testing.T) {
 	// Register an error. Checking the timeout right after should return false
 	stubCurrentTime(0)
 	eMap.markDeviceError(dName)
-	isTimedOut := eMap.checkDeviceErrorTimeout(dName)
+	isTimedOut := eMap.deviceErrorExpired(dName)
 	if isTimedOut {
 		t.Errorf("checkDeviceErrorTimeout expected to be false if called immediately after marking an error")
 	}
 
 	// Advance time. Checking the timeout should now return true
 	stubCurrentTime(int64(timeout.Seconds()) + 1)
-	isTimedOut = eMap.checkDeviceErrorTimeout(dName)
+	isTimedOut = eMap.deviceErrorExpired(dName)
 	if !isTimedOut {
 		t.Errorf("checkDeviceErrorTimeout expected to be true after waiting for timeout")
 	}
+
+	// Deleting the device and checking the timout should return false
+	eMap.deleteDevice(dName)
+	isTimedOut = eMap.deviceErrorExpired(dName)
+	if isTimedOut {
+		t.Errorf("checkDeviceErrorTimeout expected to be false after deleting device from map")
+	}
 }
 
 func stubCurrentTime(unixTime int64) {

pkg/gce-pd-csi-driver/node.go

@@ -475,8 +475,8 @@ func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUns
 		if err := ns.confirmDeviceUnused(volumeID); err != nil {
 			var ignoreableErr *ignoreableError
 			if errors.As(err, &ignoreableErr) {
-				klog.Warningf("Unabled to check if device for %s is unused. Device has been unmounted successfully. Ignoring and continuing with unstaging. (%v)", volumeID, err)
-			} else if ns.deviceInUseErrors.checkDeviceErrorTimeout(volumeID) {
+				klog.Warningf("Unable to check if device for %s is unused. Device has been unmounted successfully. Ignoring and continuing with unstaging. (%v)", volumeID, err)
+			} else if ns.deviceInUseErrors.deviceErrorExpired(volumeID) {
 				klog.Warningf("Device %s could not be released after timeout of %f seconds. NodeUnstageVolume will return success.", volumeID, ns.deviceInUseErrors.timeout.Seconds())
 			} else {
 				ns.deviceInUseErrors.markDeviceError(volumeID)