merged master

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -18,9 +18,22 @@
 			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/resources">
+	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
@@ -29,8 +42,8 @@
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="ignore_optional_problems" value="true"/>
 			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
-<classpathentry kind="src" path="src"/>
 </classpath>

.gitignore

@@ -1,11 +1,14 @@
 /bin/
 install-packages/windows/SDFS-2.0.13-Setup.exe
 install-packages/windows/bin/jre/
+install-packages/windows/wix/
 install-packages/SDFS-3.0.1-Setup.exe
 windows-exe/*/x64
 windows-exe/*/Debug/
 windows-exe/*/Release/
 windows-exe/*/ipch/
+windows-exe/WindowsSetup/WindowsSetup/bin/
+windows-exe/WindowsSetup/WindowsSetup/obj/
 windows-exe/x64
 windows-exe/Debug/
 windows-exe/Release/
@@ -35,3 +38,4 @@ pkgs/*.rpm
 pkgs/*.deb
 pkgs/*.jar
 .project
+install-packages/docker run --name sdfs-gcs -e TYPE=GOOGL.sh

.settings/org.eclipse.core.resources.prefs

@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
-encoding//src/resources=UTF-8
 encoding//test/java=UTF-8
 encoding/<project>=UTF-8
+encoding/resources=UTF-8
 encoding/src=UTF-8

.settings/org.eclipse.jdt.apt.core.prefs

@@ -1,2 +1,4 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.apt.aptEnabled=false
+org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations
+org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations

Dockerfile

@@ -8,23 +8,18 @@ COPY src /sdfs-build/src/
 COPY .git /sdfs-build/.git
 COPY install-packages /sdfs-build/install-packages/
 WORKDIR "/sdfs-build"
-RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
-    -y nsis
-RUN wget https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip && \
-    unzip EnVar_plugin.zip -d /usr/share/nsis/
-RUN wget https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip && \
-    unzip AccessControl.zip -d /usr/share/nsis/ && \
-    cp /usr/share/nsis/Plugins/i386-unicode/AccessControl.dll /usr/share/nsis/Plugins/x86-unicode/
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.48.21-ca-jre11.0.11-win_x64.zip && \
-    rm -rf install-packages/windows/bin/jre && \
-    unzip zulu11.48.21-ca-jre11.0.11-win_x64.zip -d /tmp/ && \
-    mv /tmp/zulu11.48.21-ca-jre11.0.11-win_x64  install-packages/windows/bin/jre
+RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" 
+
+#RUN wget https://cdn.azul.com/zulu/bin/zulu18.30.11-ca-jdk18.0.1-win_x64.zip && \
+#    rm -rf install-packages/windows/bin/jre && \
+#    unzip zulu18.30.11-ca-jdk18.0.1-win_x64.zip -d /tmp/ && \
+#    mv /tmp/zulu18.30.11-ca-jdk18.0.1-win_x64  install-packages/windows/bin/jre
 
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
+RUN wget https://cdn.azul.com/zulu/bin/zulu18.30.11-ca-jdk18.0.1-linux_x64.tar.gz && \
     rm -rf install-packages/deb/usr/share/sdfs/bin/jre && \
-    tar -xzvf zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
+    tar -xzvf zulu18.30.11-ca-jdk18.0.1-linux_x64.tar.gz && \
     mkdir -p install-packages/deb/usr/share/sdfs/bin/ && \
-    cp -rf zulu11.35.13-ca-jdk11.0.5-linux_x64 install-packages/deb/usr/share/sdfs/bin/jre
+    cp -rf zulu18.30.11-ca-jdk18.0.1-linux_x64 install-packages/deb/usr/share/sdfs/bin/jre
 RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
         git
 ENV VERSION=master
@@ -42,7 +37,6 @@ RUN cp target/lib/*.jar install-packages/deb/usr/share/sdfs/lib/ && \
     cp target/sdfs-${VERSION}.jar install-packages/deb/usr/share/sdfs/lib/sdfs.jar && \
     cp target/sdfs-${VERSION}.jar install-packages
 WORKDIR "/sdfs-build/install-packages/windows"
-RUN makensis -V4 -DVERSION=${PKG_VERSION} -DJARVERSION=${VERSION} sdfs_win.nsi 
 WORKDIR "/sdfs-build/install-packages/"
 RUN chmod 777 deb/sbin/sdfscli && \
     chmod 777 deb/usr/share/sdfs/sdfscli
@@ -52,9 +46,9 @@ RUN rm -rf *.deb *.rpm && \
     fpm -s dir -t deb -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -d libxml2-utils -m [email protected] --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" && \
     fpm -s dir -t rpm -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -m [email protected] --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" 
 WORKDIR "/sdfs-build/install-packages/"
-RUN echo "tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm SDFS-${PKG_VERSION}-Setup.exe" > export_data.sh && \
+RUN echo "tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm" > export_data.sh && \
     chmod 700 export_data.sh
-ENTRYPOINT tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm SDFS-${PKG_VERSION}-Setup.exe
+ENTRYPOINT tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm
 FROM ubuntu:20.04
 ENV VERSION=master
 ENV PKG_VERSION=0.0.1

Dockerfile.localbuild

@@ -39,23 +39,12 @@ COPY .git /sdfs-build/.git
 COPY install-packages /sdfs-build/install-packages/
 WORKDIR "/sdfs-build"
 RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
-    -y nsis
-RUN wget https://nsis.sourceforge.io/mediawiki/images/7/7f/EnVar_plugin.zip && \
-    unzip EnVar_plugin.zip -d /usr/share/nsis/
-RUN wget https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip && \
-    unzip AccessControl.zip -d /usr/share/nsis/ && \
-    cp /usr/share/nsis/Plugins/i386-unicode/AccessControl.dll /usr/share/nsis/Plugins/x86-unicode/
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.48.21-ca-jre11.0.11-win_x64.zip && \
-    rm -rf install-packages/windows/bin/jre && \
-    unzip zulu11.48.21-ca-jre11.0.11-win_x64.zip -d /tmp/ && \
-    mv /tmp/zulu11.48.21-ca-jre11.0.11-win_x64  install-packages/windows/bin/jre
+        git
 RUN wget https://cdn.azul.com/zulu/bin/zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
     rm -rf install-packages/deb/usr/share/sdfs/bin/jre && \
     tar -xzvf zulu11.35.13-ca-jdk11.0.5-linux_x64.tar.gz && \
     mkdir -p install-packages/deb/usr/share/sdfs/bin/ && \
     cp -rf zulu11.35.13-ca-jdk11.0.5-linux_x64 install-packages/deb/usr/share/sdfs/bin/jre
-RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
-        git
 ENV VERSION=master
 ENV PKG_VERSION=0.0.1
 ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
@@ -69,19 +58,18 @@ RUN mvn package
 RUN cp target/lib/*.jar install-packages/deb/usr/share/sdfs/lib/ && \
     cp target/sdfs-${VERSION}.jar install-packages/deb/usr/share/sdfs/lib/sdfs.jar && \
     cp target/sdfs-${VERSION}.jar install-packages
-WORKDIR "/sdfs-build/install-packages/windows"
-RUN makensis -V4 -DVERSION=${PKG_VERSION} -DJARVERSION=${VERSION} sdfs_win.nsi
 WORKDIR "/sdfs-build/install-packages/"
 RUN rm -rf *.deb *.rpm && \
     cp ../src/readme.txt deb/usr/share/sdfs/ && \
     fpm -s dir -t deb -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -d libxml2-utils -m [email protected] --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" && \
     fpm -s dir -t rpm -n sdfs -v $PKG_VERSION -C deb/ -d fuse --url http://www.opendedup.org -d libxml2 -m [email protected] --vendor datishsystems --description "SDFS is an inline deduplication based filesystem" 
 WORKDIR "/sdfs-build/install-packages/"
-RUN echo "tar cvf - sdfs-${VERSION}-jar-with-dependencies.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm SDFS-${PKG_VERSION}-Setup.exe" > export_data.sh && \
+RUN echo "tar cvf - sdfs-${VERSION}-jar-with-dependencies.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm" > export_data.sh && \
     chmod 700 export_data.sh
 ENTRYPOINT tar cvf - sdfs-${VERSION}.jar sdfs_${PKG_VERSION}_amd64.deb sdfs-${PKG_VERSION}-1.x86_64.rpm
 FROM ubuntu:20.04
 ENV VERSION=master
+ENV PKG_VERSION=0.0.1
 LABEL [email protected]
 LABEL author="Sam Silverberg"
 RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteractive" apt upgrade -y && DEBIAN_FRONTEND="noninteractive" apt install -y \
@@ -97,9 +85,9 @@ RUN DEBIAN_FRONTEND="noninteractive" apt update && DEBIAN_FRONTEND="noninteracti
         libxml2-utils \
         fuse
 WORKDIR "/tmp"
-COPY --from=builder /sdfs-build/install-packages/sdfs_${VERSION}_amd64.deb .
-RUN dpkg -i sdfs_${VERSION}_amd64.deb && \
-    rm sdfs_${VERSION}_amd64.deb
+COPY --from=builder /sdfs-build/install-packages/sdfs_${PKG_VERSION}_amd64.deb .
+RUN dpkg -i sdfs_${PKG_VERSION}_amd64.deb && \
+    rm sdfs_${PKG_VERSION}_amd64.deb
 RUN echo "* hard nofile 65535" >> /etc/security/limits.conf
 RUN	echo "* soft nofile 65535" >> /etc/security/limits.conf
 COPY --from=builder /sdfs-build/install-packages/docker_run.sh /usr/share/sdfs/docker_run.sh

SDFS_DP_Changes_after_100821_till_071221.patch

@@ -0,0 +1,180 @@
+diff --git a/src/org/opendedup/sdfs/windows/utils/WinRegistry.java b/src/org/opendedup/sdfs/windows/utils/WinRegistry.java
+index 8fd690d1..cf1d4d13 100644
+--- a/src/org/opendedup/sdfs/windows/utils/WinRegistry.java
++++ b/src/org/opendedup/sdfs/windows/utils/WinRegistry.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (C) 2016 Sam Silverberg [email protected]
++ * Copyright (C) 2016 Sam Silverberg [email protected]
+  *
+  * This file is part of OpenDedupe SDFS.
+  *
+@@ -21,65 +21,97 @@ package org.opendedup.sdfs.windows.utils;
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.StringWriter;
++import java.lang.reflect.InvocationTargetException;
++import org.opendedup.logging.SDFSLogger;
+
+-
+-public class WinRegistry {
+-	public static final int HKEY_LOCAL_MACHINE = 0x80000002;
+-
++public class WinRegistry {
+ 	public static final int KEY_SZ = 0;
+     public static final int KEY_DWORD = 1;
++    private static final String REG_QUERY = "reg query ";
++    private static final String REG_STR = "REG_SZ";
++    private static final String REG_DWORD = "REG_DWORD";
+
++	static String readRegistryRegQuery(String key) throws IOException {
++        String useKey = REG_QUERY + key;
++        int keyType = -1;
+
+-	public static final String readRegistry(String location, String key){
+-        try {
+-            // Run reg query, then read output with StreamReader (internal class)
+-            Process process = Runtime.getRuntime().exec("reg query " +
+-                    '"'+ location + "\" /v " + key);
++        Process process = Runtime.getRuntime().exec(useKey);
++        StreamReader reader = new StreamReader(process.getInputStream());
+
+-            StreamReader reader = new StreamReader(process.getInputStream());
+-            reader.start();
++        reader.start();
++        try {
+             process.waitFor();
+             reader.join();
+-            String output = reader.getResult();
+-
+-            // Output has the following format:
+-            // \n<Version information>\n\n<key>\t<registry type>\t<value>
+-            if( ! output.contains("\t")){
+-                    return null;
+-            }
++        } catch (InterruptedException e) {
++        	SDFSLogger.getLog().error(e.getMessage());
++            Thread.currentThread().interrupt();
++        }
+
+-            // Parse out the value
+-            String[] parsed = output.split("\t");
+-            return parsed[parsed.length-1];
++        String result = reader.getResult();
++        int p = -1;
++        if (result.contains(REG_STR)) {
++            p = result.indexOf(REG_STR);
++            keyType = KEY_SZ;
++        } else if (result.contains(REG_DWORD)) {
++            p = result.indexOf(REG_DWORD);
++            keyType = KEY_DWORD;
+         }
+-        catch (Exception e) {
++
++        if (p == -1) {
+             return null;
+         }
+
++        switch (keyType) {
++            case KEY_SZ:
++                return result.substring(p + REG_STR.length()).trim();
++            case KEY_DWORD:
++                String temp = result.substring(p + REG_DWORD.length()).trim();
++                return Integer.toString((Integer.parseInt(temp.substring("0x".length()), 16)));
++            default:
++                return "";
++        }
+     }
+
+     static class StreamReader extends Thread {
+-        private InputStream is;
+-        private StringWriter sw= new StringWriter();
++        private final InputStream mIs;
++
++        private final StringWriter mSw;
+
+-        public StreamReader(InputStream is) {
+-            this.is = is;
++        StreamReader(InputStream is) {
++            mIs = is;
++            mSw = new StringWriter();
+         }
+
++        @Override
+         public void run() {
++            int c;
+             try {
+-                int c;
+-                while ((c = is.read()) != -1)
+-                    sw.write(c);
++                while ((c = mIs.read()) != -1) {
++                    mSw.write(c);
++                }
++            } catch (IOException e) {
++            	SDFSLogger.getLog().error(e.getMessage());
+             }
+-            catch (IOException e) {
+-        }
++
+         }
+
+-        public String getResult() {
+-            return sw.toString();
++        String getResult() {
++            return mSw.toString();
+         }
+     }
+
++    public static String readRegistry(String location, String key) throws IOException {
++        String pathkey = "\"" +
++                location +
++                "\" /v " +
++                key;
++        return readRegistryRegQuery(pathkey);
++    }
+
++	public static void main(String[] args) throws IllegalArgumentException,
++			IllegalAccessException, InvocationTargetException {
++		//System.out.println(WinRegistry.readString(HKEY_LOCAL_MACHINE,
++		//		"SOFTWARE\\Wow6432Node\\SDFS", "path"));
++		System.out.println("Running Winregistry class");
++	}
+ }
+diff --git a/src/org/opendedup/util/OSValidator.java b/src/org/opendedup/util/OSValidator.java
+index 4a82c493..d83ca3b3 100644
+--- a/src/org/opendedup/util/OSValidator.java
++++ b/src/org/opendedup/util/OSValidator.java
+@@ -67,13 +67,13 @@ public class OSValidator {
+ 	}
+
+ 	public static String getProgramBasePath() {
+-		if (isUnix() || isMac())
+-		if(Main.sdfsBasePath.equals("")) {
+-							return "/opt/sdfs/";
+-						} else {
+-							return Main.sdfsBasePath;
+-					}
+-		else {
++		if (isUnix() || isMac()) {
++			if(Main.sdfsBasePath.equals("")) {
++				return "/opt/sdfs/";
++			} else {
++				return Main.sdfsBasePath;
++			}
++		} else {
+ 			try {
+ 				return WinRegistry.readRegistry(
+ 						"HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\SDFS", "path") + File.separator;
+@@ -85,9 +85,9 @@ public class OSValidator {
+ 	}
+
+ 	public static String getConfigPath() {
+-		if (isUnix() || isMac())
+-			return "/etc/sdfs/";
+-		else
++		if (isUnix() || isMac()) {
++			return Main.sdfsBasePath + "/etc/sdfs/";
++		} else
+ 			try {
+ 				return WinRegistry.readRegistry(
+ 						"HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\SDFS", "path")

install-packages/deb/sbin/startsdfs

@@ -9,7 +9,7 @@ EXEC="/usr/share/sdfs/jsvc"
 BASEPATH="/usr/share/sdfs"
 PF="sdfs-ncfg.pid"
 OPTIND=1
-while getopts "v:z:f:p:e:anmzcdshcrl" opt; do
+while getopts "v:z:f:p:e:b:t:w:q:anmzcdshcrl" opt; do
   case $opt in
     v)
         CFG="/etc/sdfs/$OPTARG-volume-cfg.xml"
@@ -45,7 +45,7 @@ else
         MEMORY=$MEM
 fi
 
-LD_PRELOAD="${BASEPATH}/bin/libfuse.so.2" $EXEC -server -outfile '&1' -errfile '&2' -Djava.library.path=${BASEPATH}/bin/ -home ${BASEPATH}/bin/jre -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog -Xss2m \
+$EXEC -server -outfile '&1' -errfile '&2' -Djava.library.path=${BASEPATH}/bin/ -home ${BASEPATH}/bin/jre -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog -Xss2m \
  -wait 99999999999 -Dfuse.logging.level=INFO -Dfile.encoding=UTF-8 ${DOCKER_DETATCH} -Xmx$MEMORY$MU -Xms$MEMORY$MU \
--XX:+DisableExplicitGC -pidfile /var/run/$PF -XX:+UseG1GC -Djava.awt.headless=true \
+-XX:+DisableExplicitGC ${JAVA_EXT_CMD} -pidfile /var/run/$PF -XX:+UseG1GC -Djava.awt.headless=true \
  -cp ${BASEPATH}/lib/sdfs.jar:${BASEPATH}/lib/* fuse.SDFS.MountSDFS "$@"