Skip to content

Commit f42824a

Browse files
committed
for merging w/ master
1 parent 16ad4e7 commit f42824a

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/main/java/org/apache/hadoop/fs/glusterfs/GlusterFileSystem.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ public boolean FUSEMount(String volname, String server, String mount)
7878
Process p = null;
7979
String mountCmd = null;
8080

81-
System.out.println("server= " + server);
8281
mountCmd = "mount -t glusterfs " + server + ":" + "/" + volname + " "
8382
+ mount;
8483
System.out.println("Running: " + mountCmd);
@@ -114,8 +113,6 @@ public void initialize(URI uri, Configuration conf) throws IOException {
114113
remoteGFSServer = conf.get("fs.glusterfs.server", null);
115114
needQuickRead = conf.get("quick.slave.io", null);
116115

117-
System.out.println("server 0 = "+remoteGFSServer);
118-
119116
if ((volName.length() == 0) || (remoteGFSServer.length() == 0)
120117
|| (glusterMount.length() == 0))
121118
throw new RuntimeException("Not enough info to mount FUSE: volname="+volName + " glustermount=" + glusterMount);
@@ -126,7 +123,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
126123
throw new RuntimeException("Failed to initialize GlusterFS");
127124
}
128125

129-
if ((needQuickRead.length() != 0)
126+
if((needQuickRead.length() != 0)
130127
&& (needQuickRead.equalsIgnoreCase("yes")
131128
|| needQuickRead.equalsIgnoreCase("on") || needQuickRead
132129
.equals("1")))

src/test/java/org/gluster/test/TestConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
import org.apache.hadoop.conf.Configuration;
88
import org.apache.hadoop.fs.Path;
99
import org.junit.Before;
10+
import org.junit.Ignore;
1011
import org.junit.Test;
1112

1213
/**
13-
* A meta-test: confirms that we correctly loaded gluster properties.
14+
* A meta-test: confirms that the configuration sample file has essential parameters.
1415
*/
1516
public class TestConfiguration {
17+
1618
@Test
1719
public void testGlusterProperties() throws Throwable{
1820
try{

src/test/java/org/gluster/test/TestGluster.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public static void before() throws Exception{
8383
glusterHost = addr.getHostName();
8484
}
8585

86-
System.out.println("Testing against host:" + glusterHost);
87-
System.out.println("Testing against volume:" + "glusterfs://"+glusterVolume);
86+
System.out.println("Testing against host=" + glusterHost);
87+
System.out.println("Testing against volume=" + glusterVolume);
8888

8989
tempDirectory = new File(System.getProperty("java.io.tmpdir"), "gluster");
9090
tempDirectory.mkdirs();

0 commit comments

Comments
 (0)