Merge pull request #2241 from chrislusf/add_remote_storage

WIP: remote storage

1 files changed, 23 insertions, 6 deletions

diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto
index 803a2ce32..1a5cfe79b 100644
--- a/other/java/client/src/main/proto/filer.proto
+++ b/other/java/client/src/main/proto/filer.proto
@@ -92,6 +92,12 @@ message ListEntriesResponse {
     Entry entry = 1;
 }
 
+message RemoteEntry {
+    int64 last_modified_at = 1;
+    int64 size = 2;
+    string e_tag = 3;
+    string storage_name = 4;
+}
 message Entry {
     string name = 1;
     bool is_directory = 2;
@@ -102,12 +108,7 @@ message Entry {
     int32 hard_link_counter = 8; // only exists in hard link meta data
     bytes content = 9; // if not empty, the file content
 
-    message Remote {
-        int64 last_modified_at = 1;
-        int64 size = 2;
-        string e_tag = 3;
-    }
-    Remote remote = 10;
+    RemoteEntry remote_entry = 10;
 }
 
 message FullEntry {
@@ -343,7 +344,9 @@ message LocateBrokerResponse {
     repeated Resource resources = 2;
 }
 
+/////////////////////////
 // Key-Value operations
+/////////////////////////
 message KvGetRequest {
     bytes key = 1;
 }
@@ -359,7 +362,9 @@ message KvPutResponse {
     string error = 1;
 }
 
+/////////////////////////
 // path-based configurations
+/////////////////////////
 message FilerConf {
     int32 version = 1;
     message PathConf {
@@ -375,6 +380,9 @@ message FilerConf {
     repeated PathConf locations = 2;
 }
 
+/////////////////////////
+// Remote Storage related
+/////////////////////////
 message RemoteConf {
     string type = 1;
     string name = 2;
@@ -383,3 +391,12 @@ message RemoteConf {
     string s3_region = 6;
     string s3_endpoint = 7;
 }
+
+message RemoteStorageMapping {
+    map<string,RemoteStorageLocation> mappings = 1;
+}
+message RemoteStorageLocation {
+    string name = 1;
+    string bucket = 2;
+    string path = 3;
+}