From 4838f43ed40f6afe389c74f99b5ae9263c3fb5b0 Mon Sep 17 00:00:00 2001 From: Sam Silverberg Date: Tue, 30 Aug 2022 04:07:40 +0000 Subject: [PATCH 1/3] new branch --- src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java b/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java index a7b381f1..c1e8c411 100644 --- a/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java +++ b/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java @@ -1023,6 +1023,7 @@ public void open(FileOpenRequest request, StreamObserver respo } } } + @Override public void read(DataReadRequest request, StreamObserver responseObserver) { From 4d2c0ce19f70dc3006558449896ea053f0878e5b Mon Sep 17 00:00:00 2001 From: Sam Silverberg Date: Tue, 30 Aug 2022 23:41:12 +0000 Subject: [PATCH 2/3] removed automerge --- .../opendedup/sdfs/io/MetaDataDedupFile.java | 7 +------ .../sdfs/mgmt/grpc/FileIOServiceImpl.java | 21 +++---------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/org/opendedup/sdfs/io/MetaDataDedupFile.java b/src/org/opendedup/sdfs/io/MetaDataDedupFile.java index 4d84439e..f60a7807 100644 --- a/src/org/opendedup/sdfs/io/MetaDataDedupFile.java +++ b/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)); diff --git a/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java b/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java index c1e8c411..7105d019 100644 --- a/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java +++ b/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 respons } } - - @Override public void write(DataWriteRequest request, StreamObserver responseObserver) { DataWriteResponse.Builder b = DataWriteResponse.newBuilder(); @@ -925,7 +911,7 @@ public void mknod(MkNodRequest request, StreamObserver 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 respo } } } - @Override public void read(DataReadRequest request, StreamObserver responseObserver) { From 2ea5d3661eaa44382653764fe8b78d562aeba394 Mon Sep 17 00:00:00 2001 From: Sam Silverberg Date: Wed, 31 Aug 2022 22:14:52 +0000 Subject: [PATCH 3/3] added autosync --- src/org/opendedup/sdfs/io/MetaDataDedupFile.java | 4 ++++ .../sdfs/mgmt/grpc/FileIOServiceImpl.java | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/org/opendedup/sdfs/io/MetaDataDedupFile.java b/src/org/opendedup/sdfs/io/MetaDataDedupFile.java index f60a7807..05136015 100644 --- a/src/org/opendedup/sdfs/io/MetaDataDedupFile.java +++ b/src/org/opendedup/sdfs/io/MetaDataDedupFile.java @@ -404,6 +404,10 @@ 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()) { mf = new MetaDataDedupFile(path); MetaFileStore.addToCache(mf); diff --git a/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java b/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java index 7105d019..51e9427b 100644 --- a/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java +++ b/src/org/opendedup/sdfs/mgmt/grpc/FileIOServiceImpl.java @@ -460,8 +460,20 @@ private int getFtype(String path) throws FileIOError { String pt = mountedVolume + path; File _f = new File(pt); - if (!Files.exists(Paths.get(_f.getPath()), LinkOption.NOFOLLOW_LINKS)) { - throw new FileIOError("path not found " + path, errorCodes.ENOENT); + 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); } Path p = Paths.get(_f.getPath()); try {