Parallelize httpserver.doDefrag() so that multiple FileInodes may be …

…simultaneously defragmented Note: I had to resolve the merge conflict due to the post-1.16.1 switch from fsMountHandle to fsVolumeHandle in httpserver.volumeStruct.
NVIDIA · Oct 22, 2020 · 35c3cca · 35c3cca
1 parent 3599f52
commit 35c3cca
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/httpserver/config.go b/httpserver/config.go
@@ -66,14 +66,15 @@ type JobStatusJSONPackedStruct struct {
 
 type volumeStruct struct {
 	trackedlock.Mutex
-	name                   string
-	fsMountHandle          fs.MountHandle
-	inodeVolumeHandle      inode.VolumeHandle
-	headhunterVolumeHandle headhunter.VolumeHandle
-	fsckActiveJob          *jobStruct
-	fsckJobs               sortedmap.LLRBTree // Key == jobStruct.id, Value == *jobStruct
-	scrubActiveJob         *jobStruct
-	scrubJobs              sortedmap.LLRBTree // Key == jobStruct.id, Value == *jobStruct
+	name                       string
+	fsMountHandle              fs.MountHandle
+	inodeVolumeHandle          inode.VolumeHandle
+	headhunterVolumeHandle     headhunter.VolumeHandle
+	fsckActiveJob              *jobStruct
+	fsckJobs                   sortedmap.LLRBTree // Key == jobStruct.id, Value == *jobStruct
+	scrubActiveJob             *jobStruct
+	scrubJobs                  sortedmap.LLRBTree // Key == jobStruct.id, Value == *jobStruct
+	activeDefragInodeNumberSet map[inode.InodeNumber]struct{}
 }
 
 type globalsStruct struct {
@@ -170,11 +171,12 @@ func (dummy *globalsStruct) ServeVolume(confMap conf.ConfMap, volumeName string)
 	)
 
 	volume = &volumeStruct{
-		name:           volumeName,
-		fsckActiveJob:  nil,
-		fsckJobs:       sortedmap.NewLLRBTree(sortedmap.CompareUint64, nil),
-		scrubActiveJob: nil,
-		scrubJobs:      sortedmap.NewLLRBTree(sortedmap.CompareUint64, nil),
+		name:                       volumeName,
+		fsckActiveJob:              nil,
+		fsckJobs:                   sortedmap.NewLLRBTree(sortedmap.CompareUint64, nil),
+		scrubActiveJob:             nil,
+		scrubJobs:                  sortedmap.NewLLRBTree(sortedmap.CompareUint64, nil),
+		activeDefragInodeNumberSet: make(map[inode.InodeNumber]struct{}),
 	}
 
 	volume.fsMountHandle, err = fs.MountByVolumeName(volume.name, 0)

diff --git a/httpserver/request_handler.go b/httpserver/request_handler.go
@@ -924,6 +924,7 @@ func doGetOfVolume(responseWriter http.ResponseWriter, request *http.Request) {
 		responseWriter.WriteHeader(http.StatusNotFound)
 		return
 	}
+
 	return
 }
 
@@ -1009,10 +1010,11 @@ func doMetaDefrag(responseWriter http.ResponseWriter, request *http.Request, req
 
 func doDefrag(responseWriter http.ResponseWriter, request *http.Request, requestState *requestStateStruct) {
 	var (
-		dirEntryInodeNumber inode.InodeNumber
-		dirInodeNumber      inode.InodeNumber
-		err                 error
-		pathPartIndex       int
+		alreadyInActiveDefragInodeNumberSet bool
+		dirEntryInodeNumber                 inode.InodeNumber
+		dirInodeNumber                      inode.InodeNumber
+		err                                 error
+		pathPartIndex                       int
 	)
 
 	if 3 > requestState.numPathParts {
@@ -1033,13 +1035,27 @@ func doDefrag(responseWriter http.ResponseWriter, request *http.Request, request
 		}
 	}
 
+	_, alreadyInActiveDefragInodeNumberSet = requestState.volume.activeDefragInodeNumberSet[dirEntryInodeNumber]
+	if alreadyInActiveDefragInodeNumberSet {
+		responseWriter.WriteHeader(http.StatusConflict)
+		return
+	}
+
+	requestState.volume.activeDefragInodeNumberSet[dirEntryInodeNumber] = struct{}{}
+
+	globals.Unlock()
+
 	err = requestState.volume.fsMountHandle.DefragmentFile(inode.InodeRootUserID, inode.InodeGroupID(0), nil, dirEntryInodeNumber)
 
 	if nil == err {
 		responseWriter.WriteHeader(http.StatusOK)
 	} else {
 		responseWriter.WriteHeader(http.StatusConflict)
 	}
+
+	globals.Lock()
+
+	delete(requestState.volume.activeDefragInodeNumberSet, dirEntryInodeNumber)
 }
 
 func doExtentMap(responseWriter http.ResponseWriter, request *http.Request, requestState *requestStateStruct) {