refactor

weed/pb/volume_server.proto

@@ -56,8 +56,6 @@ service VolumeServer {
     }
     rpc WriteNeedleBlob (WriteNeedleBlobRequest) returns (WriteNeedleBlobResponse) {
     }
-    rpc FetchAndWriteNeedle (FetchAndWriteNeedleRequest) returns (FetchAndWriteNeedleResponse) {
-    }
 
     rpc VolumeTailSender (VolumeTailSenderRequest) returns (stream VolumeTailSenderResponse) {
     }
@@ -95,6 +93,10 @@ service VolumeServer {
     rpc VolumeServerLeave (VolumeServerLeaveRequest) returns (VolumeServerLeaveResponse) {
     }
 
+    // remote storage
+    rpc FetchAndWriteNeedle (FetchAndWriteNeedleRequest) returns (FetchAndWriteNeedleResponse) {
+    }
+
     // <experimental> query
     rpc Query (QueryRequest) returns (stream QueriedStripe) {
     }
@@ -278,23 +280,6 @@ message WriteNeedleBlobRequest {
 }
 message WriteNeedleBlobResponse {
 }
-message FetchAndWriteNeedleRequest {
-    uint32 volume_id = 1;
-    uint64 needle_id = 2;
-    int64 offset = 3;
-    int64 size = 4;
-    // remote info
-    string remote_type = 5;
-    string remote_name = 6;
-    string s3_access_key = 8;
-    string s3_secret_key = 9;
-    string s3_region = 10;
-    string s3_endpoint = 11;
-    string remote_bucket = 12;
-    string remote_key = 13;
-}
-message FetchAndWriteNeedleResponse {
-}
 
 message VolumeTailSenderRequest {
     uint32 volume_id = 1;
@@ -445,6 +430,7 @@ message VolumeInfo {
     string replication = 3;
 }
 
+// tiered storage
 message VolumeTierMoveDatToRemoteRequest {
     uint32 volume_id = 1;
     string collection = 2;
@@ -479,6 +465,25 @@ message VolumeServerLeaveRequest {
 message VolumeServerLeaveResponse {
 }
 
+// remote storage
+message FetchAndWriteNeedleRequest {
+    uint32 volume_id = 1;
+    uint64 needle_id = 2;
+    int64 offset = 3;
+    int64 size = 4;
+    // remote conf
+    string remote_type = 5;
+    string remote_name = 6;
+    string s3_access_key = 8;
+    string s3_secret_key = 9;
+    string s3_region = 10;
+    string s3_endpoint = 11;
+    string remote_bucket = 12;
+    string remote_key = 13;
+}
+message FetchAndWriteNeedleResponse {
+}
+
 // select on volume servers
 message QueryRequest {
     repeated string selections = 1;