rename

weed/server/volume_server.go

@@ -17,9 +17,9 @@ import (
 )
 
 type VolumeServer struct {
-	inFlightDataSize      int64
-	concurrentUploadLimit int64
-	inFlightDataLimitCond *sync.Cond
+	inFlightUploadDataSize      int64
+	concurrentUploadLimit       int64
+	inFlightUploadDataLimitCond *sync.Cond
 
 	SeedMasterNodes []string
 	currentMaster   string
@@ -68,18 +68,18 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
 
 	vs := &VolumeServer{
 		pulseSeconds:            pulseSeconds,
-		dataCenter:              dataCenter,
-		rack:                    rack,
-		needleMapKind:           needleMapKind,
-		FixJpgOrientation:       fixJpgOrientation,
-		ReadMode:                readMode,
-		grpcDialOption:          security.LoadClientTLS(util.GetViper(), "grpc.volume"),
-		compactionBytePerSecond: int64(compactionMBPerSecond) * 1024 * 1024,
-		fileSizeLimitBytes:      int64(fileSizeLimitMB) * 1024 * 1024,
-		isHeartbeating:          true,
-		stopChan:                make(chan bool),
-		inFlightDataLimitCond:   sync.NewCond(new(sync.Mutex)),
-		concurrentUploadLimit:   concurrentUploadLimit,
+		dataCenter:                  dataCenter,
+		rack:                        rack,
+		needleMapKind:               needleMapKind,
+		FixJpgOrientation:           fixJpgOrientation,
+		ReadMode:                    readMode,
+		grpcDialOption:              security.LoadClientTLS(util.GetViper(), "grpc.volume"),
+		compactionBytePerSecond:     int64(compactionMBPerSecond) * 1024 * 1024,
+		fileSizeLimitBytes:          int64(fileSizeLimitMB) * 1024 * 1024,
+		isHeartbeating:              true,
+		stopChan:                    make(chan bool),
+		inFlightUploadDataLimitCond: sync.NewCond(new(sync.Mutex)),
+		concurrentUploadLimit:       concurrentUploadLimit,
 	}
 	vs.SeedMasterNodes = masterNodes
 

weed/server/volume_server_handlers.go

@@ -45,16 +45,16 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque
 
 		// wait until in flight data is less than the limit
 		contentLength := getContentLength(r)
-		vs.inFlightDataLimitCond.L.Lock()
-		for vs.concurrentUploadLimit != 0 && atomic.LoadInt64(&vs.inFlightDataSize) > vs.concurrentUploadLimit {
-			glog.V(4).Infof("wait because inflight data %d > %d", vs.inFlightDataSize, vs.concurrentUploadLimit)
-			vs.inFlightDataLimitCond.Wait()
+		vs.inFlightUploadDataLimitCond.L.Lock()
+		for vs.concurrentUploadLimit != 0 && atomic.LoadInt64(&vs.inFlightUploadDataSize) > vs.concurrentUploadLimit {
+			glog.V(4).Infof("wait because inflight data %d > %d", vs.inFlightUploadDataSize, vs.concurrentUploadLimit)
+			vs.inFlightUploadDataLimitCond.Wait()
 		}
-		atomic.AddInt64(&vs.inFlightDataSize, contentLength)
-		vs.inFlightDataLimitCond.L.Unlock()
+		atomic.AddInt64(&vs.inFlightUploadDataSize, contentLength)
+		vs.inFlightUploadDataLimitCond.L.Unlock()
 		defer func() {
-			atomic.AddInt64(&vs.inFlightDataSize, -contentLength)
-			vs.inFlightDataLimitCond.Signal()
+			atomic.AddInt64(&vs.inFlightUploadDataSize, -contentLength)
+			vs.inFlightUploadDataLimitCond.Signal()
 		}()
 
 		// processs uploads