Merge pull request #119 from arenadata/update-release-branch

[Release] Port commits to release branch
arenadata · Sep 27, 2024 · d206ac8 · d206ac8
2 parents 9c77013 + f12f366
commit d206ac8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/smart-client/src/main/java/org/smartdata/client/SmartClient.java b/smart-client/src/main/java/org/smartdata/client/SmartClient.java
@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 import static org.smartdata.utils.ConfigUtil.getSsmRpcAddresses;
@@ -57,7 +58,7 @@ public class SmartClient implements Closeable, SmartClientProtocol {
   private final PathChecker pathChecker;
   private final FileAccessReportStrategy fileAccessReportStrategy;
   private final ActiveServerAddressCache activeServerAddressCache;
-  private volatile boolean running = true;
+  private final AtomicBoolean running;
 
   public SmartClient(Configuration conf) throws IOException {
     this(conf, getSsmRpcAddresses(conf));
@@ -84,6 +85,7 @@ public SmartClient(
     this.smartServerHandles = new SmartServerHandles(
         initializeServerHandles(ssmRpcAddresses));
     this.fileAccessReportStrategy = FileAccessReportStrategy.from(conf, smartServerHandles);
+    this.running = new AtomicBoolean(true);
   }
 
   private List<SmartServerHandle> initializeServerHandles(
@@ -172,8 +174,7 @@ public boolean shouldIgnore(String path) {
 
   @Override
   public void close() throws IOException {
-    if (running) {
-      running = false;
+    if (running.compareAndSet(true, false)) {
       for (SmartServerHandle server : smartServerHandles.handles()) {
         RPC.stopProxy(server.getProtocol());
       }
@@ -194,7 +195,7 @@ private Collection<InetSocketAddress> getOrderedServerAddresses(
   }
 
   private void checkOpen() throws IOException {
-    if (!running) {
+    if (!running.get()) {
       throw new IOException("SmartClient closed");
     }
   }

diff --git a/.../src/main/java/org/smartdata/protocol/protobuffer/ClientProtocolClientSideTranslator.java b/.../src/main/java/org/smartdata/protocol/protobuffer/ClientProtocolClientSideTranslator.java
@@ -25,13 +25,15 @@
 import org.smartdata.protocol.ClientServerProto.ReportFileAccessEventRequestProto;
 import org.smartdata.protocol.SmartClientProtocol;
 
+import java.io.Closeable;
 import java.io.IOException;
 
 import static org.smartdata.protocol.protobuffer.ProtoBufferHelper.ipc;
 
 public class ClientProtocolClientSideTranslator implements
-    java.io.Closeable, SmartClientProtocol {
-  private ClientProtocolProtoBuffer rpcProxy;
+    Closeable, SmartClientProtocol {
+
+  private final ClientProtocolProtoBuffer rpcProxy;
 
   public ClientProtocolClientSideTranslator(
       ClientProtocolProtoBuffer proxy) {
@@ -41,7 +43,6 @@ public ClientProtocolClientSideTranslator(
   @Override
   public void close() throws IOException {
     RPC.stopProxy(rpcProxy);
-    rpcProxy = null;
   }
 
   @Override