accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/8] accumulo git commit: ACCUMULO-4080 Checkstyle changes.
Date Fri, 18 Dec 2015 19:08:14 GMT
ACCUMULO-4080 Checkstyle changes.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5960cfe9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5960cfe9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5960cfe9

Branch: refs/heads/master
Commit: 5960cfe990700bd2ddb14980c46356ea1ad21e90
Parents: 8b83b4a
Author: Josh Elser <elserj@apache.org>
Authored: Thu Dec 17 23:09:33 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Dec 17 23:09:33 2015 -0500

----------------------------------------------------------------------
 .../accumulo/server/util/FileSystemMonitor.java |  3 +-
 .../server/util/FileSystemMonitorTest.java      | 35 +++++++-------------
 2 files changed, 13 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5960cfe9/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index 93d6397..11d0e0f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@ -62,8 +62,7 @@ public class FileSystemMonitor {
     @Override
     public String toString() {
       StringBuilder sb = new StringBuilder(32);
-      sb.append(device).append(" on ").append(mountPoint).append(" as ").append(filesystemType)
-          .append(" with options ").append(options);
+      sb.append(device).append(" on ").append(mountPoint).append(" as ").append(filesystemType).append("
with options ").append(options);
       return sb.toString();
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5960cfe9/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
index 7d4bd20..ec389fd 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/FileSystemMonitorTest.java
@@ -35,22 +35,17 @@ import org.slf4j.LoggerFactory;
 public class FileSystemMonitorTest {
   private static final Logger log = LoggerFactory.getLogger(FileSystemMonitorTest.class);
   private static final Charset UTF_8 = Charset.forName("UTF-8");
-  
+
   @Test
   public void testFilteredMountEntries() throws Exception {
-    String[] mountEntries = new String[] {
-        "rootfs / rootfs rw 0 0",
-        "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0",
+    String[] mountEntries = new String[] {"rootfs / rootfs rw 0 0", "proc /proc proc rw,nosuid,nodev,noexec,relatime
0 0",
         "sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0",
         "devtmpfs /dev devtmpfs rw,seclabel,nosuid,size=8119336k,nr_inodes=2029834,mode=755
0 0",
-        "securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0",
-        "tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0",
-        "devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000
0 0",
-        "tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0",
+        "securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0",
"tmpfs /dev/shm tmpfs rw,seclabel,nosuid,nodev 0 0",
+        "devpts /dev/pts devpts rw,seclabel,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000
0 0", "tmpfs /run tmpfs rw,seclabel,nosuid,nodev,mode=755 0 0",
         "tmpfs /sys/fs/cgroup tmpfs ro,seclabel,nosuid,nodev,noexec,mode=755 0 0",
         "cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
0 0",
-        "pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0",
-        "cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0",
+        "pstore /sys/fs/pstore pstore rw,nosuid,nodev,noexec,relatime 0 0", "cgroup /sys/fs/cgroup/cpuset
cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0",
         "cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu
0 0",
         "cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0",
         "cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0",
@@ -58,19 +53,13 @@ public class FileSystemMonitorTest {
         "cgroup /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0",
         "cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0",
         "cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event
0 0",
-        "cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0",
-        "configfs /sys/kernel/config configfs rw,relatime 0 0",
-        "/dev/vda1 / xfs rw,seclabel,relatime,attr2,inode64,noquota 0 0",
-        "/dev/vda2 /ignoreme reiserfs rw 0 0",
-        "rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0",
-        "selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0",
+        "cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0",
"configfs /sys/kernel/config configfs rw,relatime 0 0",
+        "/dev/vda1 / xfs rw,seclabel,relatime,attr2,inode64,noquota 0 0", "/dev/vda2 /ignoreme
reiserfs rw 0 0",
+        "rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0", "selinuxfs /sys/fs/selinux
selinuxfs rw,relatime 0 0",
         "systemd-1 /proc/sys/fs/binfmt_misc autofs rw,relatime,fd=32,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
0 0",
-        "debugfs /sys/kernel/debug debugfs rw,relatime 0 0",
-        "mqueue /dev/mqueue mqueue rw,seclabel,relatime 0 0",
-        "hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0",
-        "sunrpc /proc/fs/nfsd nfsd rw,relatime 0 0",
-        "/dev/vdb /grid/0 ext4 rw,seclabel,relatime,data=ordered 0 0"
-    };
+        "debugfs /sys/kernel/debug debugfs rw,relatime 0 0", "mqueue /dev/mqueue mqueue rw,seclabel,relatime
0 0",
+        "hugetlbfs /dev/hugepages hugetlbfs rw,seclabel,relatime 0 0", "sunrpc /proc/fs/nfsd
nfsd rw,relatime 0 0",
+        "/dev/vdb /grid/0 ext4 rw,seclabel,relatime,data=ordered 0 0"};
 
     StringBuilder sb = new StringBuilder(256);
     for (String mountEntry : mountEntries) {
@@ -94,5 +83,5 @@ public class FileSystemMonitorTest {
     }
     assertEquals("Should not have any extra mount points: " + expectedCheckedMountPoints,
0, expectedCheckedMountPoints.size());
   }
-  
+
 }


Mime
View raw message