From: Noah Watkins <noahwatkins@gmail.com>
Date: Wed, 2 Nov 2011 22:49:09 +0000 (-0700)
Subject: hadoop: remove unused fs_default_name
X-Git-Tag: v0.39~164^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=376dad92de3f486dc04d59300db69a532f5a5e56;p=ceph.git

hadoop: remove unused fs_default_name

The variable fs_default_name is effectively unused
and the same affect is achieved by treating paths
in a standard way (they contain the scheme:/).

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/client/hadoop/ceph/CephFileSystem.java b/src/client/hadoop/ceph/CephFileSystem.java
index 6ad249bfd857..3f5b0f816465 100644
--- a/src/client/hadoop/ceph/CephFileSystem.java
+++ b/src/client/hadoop/ceph/CephFileSystem.java
@@ -72,8 +72,6 @@ public class CephFileSystem extends FileSystem {
   private final Path root;
   private CephFS ceph = null;
 
-  private String fs_default_name;
-
   /**
    * Create a new CephFileSystem.
    */
@@ -86,11 +84,10 @@ public class CephFileSystem extends FileSystem {
    * sets the given CephFS instead of defaulting to a
    * CephTalker (with its assumed real Ceph instance to talk to).
    */
-  public CephFileSystem(CephFS ceph_fs, String default_path) {
+  public CephFileSystem(CephFS ceph_fs) {
     super();
     root = new Path("/");
     ceph = ceph_fs;
-    fs_default_name = default_path;
   }
 
   /**
@@ -118,9 +115,6 @@ public class CephFileSystem extends FileSystem {
     if (ceph == null) {
       ceph = new CephTalker(conf, LOG);
     }
-    if (null == fs_default_name) {
-      fs_default_name = conf.get("fs.default.name");
-    }
     // build up the arguments for Ceph
     String arguments = "CephFSInterface";
 
diff --git a/src/client/hadoop/ceph/TestCeph.java b/src/client/hadoop/ceph/TestCeph.java
index de20ef080391..e46b0eed3a19 100644
--- a/src/client/hadoop/ceph/TestCeph.java
+++ b/src/client/hadoop/ceph/TestCeph.java
@@ -37,7 +37,7 @@ public class TestCeph extends FileSystemContractBaseTest {
   protected void setUp() throws IOException {
     Configuration conf = new Configuration();
     CephFaker cephfaker = new CephFaker(conf, FileSystem.LOG);
-    CephFileSystem cephfs = new CephFileSystem(cephfaker, "ceph://null");
+    CephFileSystem cephfs = new CephFileSystem(cephfaker);
 
     cephfs.initialize(URI.create("ceph://null"), conf);
     fs = cephfs;