Fix #858, File Access Event should set user info

littlezhou · Nov 21, 2017 · ba34d19 · ba34d19
1 parent 227cb59
commit ba34d19
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...p-support/smart-hadoop-client/src/main/java/org/smartdata/hdfs/client/SmartDFSClient.java b/...p-support/smart-hadoop-client/src/main/java/org/smartdata/hdfs/client/SmartDFSClient.java
@@ -22,6 +22,7 @@
 import org.apache.hadoop.fs.UnresolvedLinkException;
 import org.apache.hadoop.hdfs.DFSClient;
 import org.apache.hadoop.hdfs.DFSInputStream;
+import org.apache.hadoop.security.UserGroupInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.smartdata.SmartConstants;
@@ -141,7 +142,13 @@ private void reportFileAccessEvent(String src) {
       if (!healthy) {
         return;
       }
-      smartClient.reportFileAccessEvent(new FileAccessEvent(src));
+      String userName;
+      try {
+        userName = UserGroupInformation.getCurrentUser().getUserName();
+      } catch (IOException e) {
+        userName = "Unknown";
+      }
+      smartClient.reportFileAccessEvent(new FileAccessEvent(src, userName));
     } catch (IOException e) {
       // Here just ignores that failed to report
       LOG.error("Cannot report file access event to SmartServer: " + src

diff --git a/smart-metrics/src/main/java/org/smartdata/metrics/FileAccessEvent.java b/smart-metrics/src/main/java/org/smartdata/metrics/FileAccessEvent.java
@@ -39,6 +39,10 @@ public FileAccessEvent(String path, long timeStamp, String user) {
     this.user = user;
   }
 
+  public FileAccessEvent(String path, String user) {
+    this(path, -1, user);
+  }
+
   /**
    * Get the accessed file path.
    * @return file path