From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 30 Jul 2009 03:11:15 +0000 (-0700)
Subject: Hadoop: More work with deprecated and inappropriately-overridden functions.
X-Git-Tag: v0.12~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ff4fbd14400dc1c1bac2707690a9c8f5dca3270;p=ceph.git

Hadoop: More work with deprecated and inappropriately-overridden functions.
---

diff --git a/src/client/hadoop/ceph/CephFileSystem.java b/src/client/hadoop/ceph/CephFileSystem.java
index 5de9a2c13a74..f962bc54006e 100644
--- a/src/client/hadoop/ceph/CephFileSystem.java
+++ b/src/client/hadoop/ceph/CephFileSystem.java
@@ -106,8 +106,9 @@ public class CephFileSystem extends FileSystem {
   @Override
     public void close() throws IOException {
     debug("close:enter");
+    super.close();//this method does stuff, make sure it's run!
     System.gc(); //to run the finalizers on CephInput/OutputStreams
-    ceph_kill_client();
+    //    ceph_kill_client();
     //for some reason this just hangs, so not doing it for now
     debug("close:exit");
   }
@@ -126,7 +127,8 @@ public class CephFileSystem extends FileSystem {
     return new FSDataOutputStream(cephOStream);
   }
 
-  public String getName() {
+  @Deprecated
+    public String getName() {
     debug("getName:enter");
     debug("getName:exit with value " + getUri().toString());
     return getUri().toString();
@@ -633,12 +635,6 @@ public class CephFileSystem extends FileSystem {
     return tmpLocalFile;
   }
 
-  @Override
-    public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile)
-    throws IOException {
-    moveFromLocalFile(tmpLocalFile, fsOutputFile);
-  }
-
   private void debug(String statement) {
     if (debug) System.err.println(statement);
   }