add a option to provide customized bucket endpoint (#1008)

juicedata · Nov 18, 2021 · 30c8220 · 30c8220
1 parent 96e8c01
commit 30c8220
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/cmd/gateway.go b/cmd/gateway.go
@@ -213,6 +213,9 @@ func (g *GateWay) NewGatewayLayer(creds auth.Credentials) (minio.ObjectLayer, er
 		}
 		chunkConf.CacheDir = strings.Join(ds, string(os.PathListSeparator))
 	}
+	if c.IsSet("bucket") {
+		format.Bucket = c.String("bucket")
+	}
 	blob, err := createStorage(format)
 	if err != nil {
 		logger.Fatalf("object storage: %s", err)

diff --git a/cmd/mount.go b/cmd/mount.go
@@ -166,6 +166,9 @@ func mount(c *cli.Context) error {
 		}
 		chunkConf.CacheDir = strings.Join(ds, string(os.PathListSeparator))
 	}
+	if c.IsSet("bucket") {
+		format.Bucket = c.String("bucket")
+	}
 	blob, err := createStorage(format)
 	if err != nil {
 		logger.Fatalf("object storage: %s", err)
@@ -257,6 +260,10 @@ func clientFlags() []cli.Flag {
 		defaultCacheDir = path.Join(homeDir, ".juicefs", "cache")
 	}
 	return []cli.Flag{
+		&cli.StringFlag{
+			Name:  "bucket",
+			Usage: "customized endpoint to access object store",
+		},
 		&cli.IntFlag{
 			Name:  "get-timeout",
 			Value: 60,

diff --git a/sdk/java/libjfs/main.go b/sdk/java/libjfs/main.go
@@ -214,6 +214,7 @@ func freeHandle(fd int) {
 
 type javaConf struct {
 	MetaURL         string  `json:"meta"`
+	Bucket          string  `json:"bucket"`
 	ReadOnly        bool    `json:"readOnly"`
 	OpenCache       float64 `json:"openCache"`
 	CacheDir        string  `json:"cacheDir"`
@@ -359,6 +360,9 @@ func jfs_init(cname, jsonConf, user, group, superuser, supergroup *C.char) uintp
 			go metric.UpdateMetrics(m)
 		}
 
+		if jConf.Bucket != "" {
+			format.Bucket = jConf.Bucket
+		}
 		blob, err := createStorage(format)
 		if err != nil {
 			logger.Fatalf("object storage: %s", err)

diff --git a/sdk/java/src/main/java/io/juicefs/JuiceFileSystemImpl.java b/sdk/java/src/main/java/io/juicefs/JuiceFileSystemImpl.java
@@ -310,6 +310,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
     for (String key : bkeys) {
       obj.put(key, Boolean.valueOf(getConf(conf, key, "false")));
     }
+    obj.put("bucket", getConf(conf, "bucket", ""));
     obj.put("readOnly", Boolean.valueOf(getConf(conf, "read-only", "false")));
     obj.put("cacheDir", getConf(conf, "cache-dir", "memory"));
     obj.put("cacheSize", Integer.valueOf(getConf(conf, "cache-size", "100")));
@@ -501,11 +502,11 @@ public static Libjfs loadLibrary() throws IOException {
 
     LibraryLoader<Libjfs> libjfsLibraryLoader = LibraryLoader.create(Libjfs.class);
     libjfsLibraryLoader.failImmediately();
-    String name = "libjfs.3.so";
+    String name = "libjfs.4.so";
     File dir = new File("/tmp");
     String os = System.getProperty("os.name");
     if (os.toLowerCase().contains("windows")) {
-      name = "libjfs2.dll";
+      name = "libjfs3.dll";
       dir = new File(System.getProperty("java.io.tmpdir"));
     }
     File libFile = new File(dir, name);