removed automerge

Author: opendedup

src/org/opendedup/sdfs/io/MetaDataDedupFile.java

@@ -404,16 +404,11 @@ public static MetaDataDedupFile getFile(String path) throws IOException {
 			} catch (IOException e) {
 				SDFSLogger.getLog().warn(e);
 			}
-		} else if(!f.exists() && FileReplicationService.MetaFileExists(f.getPath().substring(pl))) {
-			GetCloudFile cf = new GetCloudFile();
-			cf.getResult(f.getPath().substring(pl),f.getPath().substring(pl));
-			cf.downloadAll();
-		}else if (!f.exists() || f.isDirectory()) {
+		} else if (!f.exists() || f.isDirectory()) {
 			mf = new MetaDataDedupFile(path);
 			MetaFileStore.addToCache(mf);
 		}
 		else {
-
 			ObjectInputStream in = null;
 			try {
 				in = new ObjectInputStream(new FileInputStream(path));

src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java

@@ -460,20 +460,8 @@ private int getFtype(String path) throws FileIOError {
         String pt = mountedVolume + path;
         File _f = new File(pt);
 
-        try {
-            if (!Files.exists(Paths.get(_f.getPath()), LinkOption.NOFOLLOW_LINKS)
-                    && !FileReplicationService.MetaFileExists(path.trim())) {
-                throw new FileIOError("path not found " + path, errorCodes.ENOENT);
-            }
-            if (!Files.exists(Paths.get(_f.getPath()), LinkOption.NOFOLLOW_LINKS)
-                    && FileReplicationService.MetaFileExists(path.trim())) {
-                GetCloudFile cf = new GetCloudFile();
-                cf.getResult(path.trim(), path.trim());
-                cf.downloadAll();
-            }
-        } catch (IOException e1) {
-            SDFSLogger.getLog().error("unable to check file", e1);
-            throw new FileIOError("path not found " + path, errorCodes.EIO);
+        if (!Files.exists(Paths.get(_f.getPath()), LinkOption.NOFOLLOW_LINKS)) {
+            throw new FileIOError("path not found " + path, errorCodes.ENOENT);
         }
         Path p = Paths.get(_f.getPath());
         try {
@@ -776,8 +764,6 @@ public void unlink(UnlinkRequest request, StreamObserver<UnlinkResponse> respons
         }
     }
 
-    
-
     @Override
     public void write(DataWriteRequest request, StreamObserver<DataWriteResponse> responseObserver) {
         DataWriteResponse.Builder b = DataWriteResponse.newBuilder();
@@ -925,7 +911,7 @@ public void mknod(MkNodRequest request, StreamObserver<MkNodResponse> responseOb
                 try {
                     this.getFtype(path);
                 } catch (FileIOError e) {
-                    
+
                 }
                 File f = new File(FileIOServiceImpl.mountedVolume + path);
 
@@ -1023,7 +1009,6 @@ public void open(FileOpenRequest request, StreamObserver<FileOpenResponse> respo
             }
         }
     }
-    
 
     @Override
     public void read(DataReadRequest request, StreamObserver<DataReadResponse> responseObserver) {