do not leave orphan goroutine for waiting file handle close

fs/fs.go

@@ -2,7 +2,6 @@ package fs
 
 import (
 	"path"
-	"sync"
 	"time"
 
 	"github.com/cyverse/go-irodsclient/irods/common"
@@ -306,7 +305,7 @@ func (fs *FileSystem) RemoveFile(path string, force bool) error {
 	defer fs.metadataSession.ReturnConnection(conn) //nolint
 
 	// if file handle is opened, wg
-	wg := sync.WaitGroup{}
+	wg := util.NewTimeoutWaitGroup()
 	wg.Add(1)
 
 	eventHandlerID := fs.fileHandleMap.AddCloseEventHandler(irodsPath, func(path, id string, empty bool) {
@@ -317,7 +316,7 @@ func (fs *FileSystem) RemoveFile(path string, force bool) error {
 
 	defer fs.fileHandleMap.RemoveCloseEventHandler(eventHandlerID)
 
-	if util.WaitTimeout(&wg, time.Duration(fs.config.MetadataConnection.OperationTimeout)) {
+	if wg.WaitTimeout(time.Duration(fs.config.MetadataConnection.OperationTimeout)) {
 		// timed out
 		return xerrors.Errorf("failed to remove file, there are files still opened")
 	}

irods/util/timeout_wait.go

@@ -0,0 +1,50 @@
+package util
+
+import (
+	"sync/atomic"
+	"time"
+)
+
+type TimeoutWaitGroup struct {
+	count int32
+	done  chan struct{}
+}
+
+func NewTimeoutWaitGroup() *TimeoutWaitGroup {
+	return &TimeoutWaitGroup{
+		done: make(chan struct{}),
+	}
+}
+
+func (wg *TimeoutWaitGroup) Add(i int32) {
+	select {
+	case <-wg.done:
+		panic("use of an already closed TimeoutWaitGroup")
+	default:
+	}
+
+	atomic.AddInt32(&wg.count, i)
+}
+
+func (wg *TimeoutWaitGroup) Done() {
+	i := atomic.AddInt32(&wg.count, -1)
+	if i == 0 {
+		close(wg.done)
+	}
+	if i < 0 {
+		panic("too many Done() calls")
+	}
+}
+
+func (wg *TimeoutWaitGroup) C() <-chan struct{} {
+	return wg.done
+}
+
+func (wg *TimeoutWaitGroup) WaitTimeout(timeout time.Duration) bool {
+	select {
+	case <-wg.done:
+		return true // done
+	case <-time.After(timeout):
+		return false // timed out
+	}
+}