feat: support static available storage

Author: PalanQu

node/rpc/node_rpc_server.go

@@ -222,10 +222,9 @@ func (r *RPCServer) GetWorkerInfo(
 	info := []*protobufs.WorkerInfo{}
 	for _, worker := range workers {
 		info = append(info, &protobufs.WorkerInfo{
-			CoreId: uint32(worker.CoreId),
-			Filter: worker.Filter,
-			// TODO(2.1.1+): Expose available storage
-			AvailableStorage: uint64(worker.TotalStorage),
+			CoreId:           uint32(worker.CoreId),
+			Filter:           worker.Filter,
+			AvailableStorage: uint64(worker.AvailableStorage),
 			TotalStorage:     uint64(worker.TotalStorage),
 		})
 	}

node/store/worker.go

@@ -190,9 +190,9 @@ func encodeWorkerInfo(worker *store.WorkerInfo) ([]byte, error) {
 	streamListenMultiaddrLen := uint16(len(worker.StreamListenMultiaddr))
 	filterLen := uint16(len(worker.Filter))
 
-	// totalLen = coreId(8) + totalStorage(8) + automatic(1) + allocated(1)
+	// totalLen = coreId(8) + totalStorage(8) + availableStorage(8) + automatic(1) + allocated(1)
 	//   + 2 + listen + 2 + stream + 2 + filter
-	totalLen := 8 + 8 + 1 + 1 + 2 + int(listenMultiaddrLen) + 2 +
+	totalLen := 8 + 8 + 8 + 1 + 1 + 2 + int(listenMultiaddrLen) + 2 +
 		int(streamListenMultiaddrLen) + 2 + int(filterLen)
 	data := make([]byte, totalLen)
 
@@ -203,6 +203,9 @@ func encodeWorkerInfo(worker *store.WorkerInfo) ([]byte, error) {
 	binary.BigEndian.PutUint64(data[offset:], uint64(worker.TotalStorage))
 	offset += 8
 
+	binary.BigEndian.PutUint64(data[offset:], uint64(worker.AvailableStorage))
+	offset += 8
+
 	if worker.Automatic {
 		data[offset] = 1
 	} else {
@@ -252,6 +255,15 @@ func decodeWorkerInfo(data []byte) (*store.WorkerInfo, error) {
 	totalStorage := binary.BigEndian.Uint64(data[offset:])
 	offset += 8
 
+	var availableStorage uint64
+	// Backwards compatibility
+	if offset+8 <= len(data) {
+		availableStorage = binary.BigEndian.Uint64(data[offset:])
+		offset += 8
+	} else {
+		availableStorage = totalStorage
+	}
+
 	if offset+1 > len(data) {
 		return nil, errors.New("truncated automatic flag")
 	}
@@ -312,6 +324,7 @@ func decodeWorkerInfo(data []byte) (*store.WorkerInfo, error) {
 		StreamListenMultiaddr: streamListenMultiaddr,
 		Filter:                filter,
 		TotalStorage:          uint(totalStorage),
+		AvailableStorage:      uint(availableStorage),
 		Automatic:             automatic,
 		Allocated:             allocated,
 	}, nil

node/worker/manager.go

@@ -636,6 +636,7 @@ func (w *WorkerManager) getIPCOfWorker(coreId uint) (
 				StreamListenMultiaddr: addr.String(),
 				Filter:                nil,
 				TotalStorage:          0,
+				AvailableStorage:      0,
 				Automatic:             len(w.config.Engine.DataWorkerP2PMultiaddrs) == 0,
 				Allocated:             false,
 			})

types/store/worker.go

@@ -6,6 +6,7 @@ type WorkerInfo struct {
 	StreamListenMultiaddr string
 	Filter                []byte
 	TotalStorage          uint
+	AvailableStorage      uint
 	Automatic             bool
 	Allocated             bool
 }