Updates for internaltional characters and 3.2 bug fixes

opendedup · Aug 17, 2016 · 4e2547c · 4e2547c
1 parent 149a20f
commit 4e2547c
Show file tree

Hide file tree

Showing 11 changed files with 910 additions and 866 deletions.
diff --git a/src/fuse/Filesystem3ToFuseFSAdapter.java b/src/fuse/Filesystem3ToFuseFSAdapter.java
diff --git a/src/fuse/SDFS/MountSDFS.java b/src/fuse/SDFS/MountSDFS.java
@@ -213,15 +213,15 @@ private static void setup(String[] args) throws ParseException {
 		Runtime.getRuntime().addShutdownHook(shutdownHook);
 		if (cmd.hasOption("o")) {
 			fal.add("-o");
-			fal.add("direct_io,allow_other,nonempty,big_writes,allow_other,fsname=sdfs:"
+			fal.add("modules=iconv,from_code=UTF-8,to_code=UTF-8,direct_io,allow_other,nonempty,big_writes,allow_other,fsname=sdfs:"
 					+ volumeConfigFile
 					+ ":"
 					+ Main.sdfsCliPort
 					+ ","
 					+ cmd.getOptionValue("o"));
 		} else {
 			fal.add("-o");
-			fal.add("direct_io,allow_other,nonempty,big_writes,allow_other,fsname=sdfs:"
+			fal.add("modules=iconv,from_code=UTF-8,to_code=UTF-8,direct_io,allow_other,nonempty,big_writes,allow_other,fsname=sdfs:"
 					+ volumeConfigFile + ":" + Main.sdfsCliPort);
 		}
 		sFal = new String[fal.size()];

diff --git a/src/fuse/SDFS/SDFSFileSystem.java b/src/fuse/SDFS/SDFSFileSystem.java
@@ -412,7 +412,7 @@ public int mkdir(String path, int mode) throws FuseException {
 
 	@Override
 	public int mknod(String path, int mode, int rdev) throws FuseException {
-		// SDFSLogger.getLog().info("4=" + path);
+		SDFSLogger.getLog().info("4=" + path);
 		try {
 			File f = new File(this.mountedVolume + path);
 			if (Main.volume.isOffLine())
@@ -842,6 +842,7 @@ else if (_f.isFile())
 	}
 
 	private int getFtype(String path) throws FuseException {
+		SDFSLogger.getLog().info("Path=" + path);
 		String pt = mountedVolume + path;
 		File _f = new File(pt);
 

diff --git a/src/org/opendedup/sdfs/VolumeConfigWriter.java b/src/org/opendedup/sdfs/VolumeConfigWriter.java
@@ -436,6 +436,7 @@ else if (this.azureEnabled) {
 		if (cmd.hasOption("cloud-url")) {
 			this.cloudUrl = cmd.getOptionValue("cloud-url");
 			this.genericS3 = true;
+			this.simpleS3 = true;
 		}
 		if (cmd.hasOption("cluster-dse-password"))
 			this.clusterDSEPassword = cmd

diff --git a/src/org/opendedup/sdfs/filestore/AbstractBatchStore.java b/src/org/opendedup/sdfs/filestore/AbstractBatchStore.java
@@ -33,7 +33,7 @@ public boolean checkAccess(String username, String password,
 
 	public boolean objectClaimed(String key) throws IOException;
 
-	public Iterator<String> getNextObjectList() throws IOException;
+	public Iterator<String> getNextObjectList(String prefix) throws IOException;
 
 	public StringResult getStringResult(String key) throws IOException,
 			InterruptedException;

diff --git a/src/org/opendedup/sdfs/filestore/BatchFileChunkStore.java b/src/org/opendedup/sdfs/filestore/BatchFileChunkStore.java
@@ -695,7 +695,7 @@ public void iterationInit(boolean deep) {
 			HashBlobArchive.compressedLength.set(0);
 			this.ht = null;
 			this.hid = 0;
-			dl = new MultiDownload(this);
+			dl = new MultiDownload(this,"");
 			maps = this.traverseCache(new File(Main.chunkStore)).iterator();
 			dl.iterationInit(false, "");
 		} catch (Exception e) {
@@ -706,7 +706,7 @@ public void iterationInit(boolean deep) {
 	boolean fr = true;
 
 	@Override
-	public Iterator<String> getNextObjectList() throws IOException {
+	public Iterator<String> getNextObjectList(String prefix) throws IOException {
 		return maps;
 
 	}