hadoop: remove hadoop shim

The in-tree Hadoop shim was a combination of libcephfs wrapper, and the bits to support Hadoop. This has been replaced by src/java that implements generic libcephfs wrappers, and externally, the hadoop shim (see docs). Signed-off-by: Noah Watkins <[email protected]>
simon-rock · Sep 13, 2013 · b86c068 · b86c068
1 parent 40e0cab
commit b86c068
Show file tree

Hide file tree

Showing 29 changed files with 2 additions and 6,141 deletions.
diff --git a/COPYING b/COPYING
@@ -6,10 +6,6 @@ Files: doc/*
 Copyright: (c) 2010-2012 New Dream Network and contributors
 License: Creative Commons Attribution-ShareAlike (CC BY-SA)
 
-Files: src/client/hadoop/ceph
-Copyright: Copyright (C) New Dream Network and contributors
-License: Apache License v2
-
 Files: src/mount/canonicalize.c
 Copyright: Copyright (C) 1993 Rick Sladkey <[email protected]>
 License: LGPL2 or later

diff --git a/ceph.spec.in b/ceph.spec.in
@@ -278,7 +278,6 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 		--localstatedir=/var \
 		--sysconfdir=/etc \
 		--docdir=%{_docdir}/ceph \
-		--without-hadoop \
 		--with-nss \
 		--without-cryptopp \
 		--with-rest-bench \

diff --git a/configure.ac b/configure.ac
@@ -391,25 +391,6 @@ if test "x$enable_cephfs_java" = "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_JUNIT4, [test "$have_junit4" = "1"])
 
-# jni?
-# clear cache (from java above) -- this whole thing will get
-# folded into the bigger java package later -- for now maintain
-# backward compat
-AS_UNSET(ac_cv_header_jni_h)
-AC_ARG_WITH([hadoop],
-            [AS_HELP_STRING([--with-hadoop], [build hadoop client])],
-            [],
-            [with_hadoop=check])
-AS_IF([test "x$with_hadoop" != xno],
-	    [AC_CHECK_HEADER([jni.h],
-             [HAVE_JNI=1],
-             [if test "x$with_hadoop" != xcheck; then
-                 AC_MSG_FAILURE(
-                   [--with-hadoop was given but jni.h not found])
-               fi
-             ])])
-AM_CONDITIONAL(WITH_HADOOPCLIENT, [test "$HAVE_JNI" = "1"])
-
 #
 # FreeBSD has it in base.
 #

diff --git a/debian/copyright b/debian/copyright
@@ -7,10 +7,6 @@ Files: *
 Copyright: (c) 2004-2010 by Sage Weil <[email protected]>
 License: LGPL2.1 (see /usr/share/common-licenses/LGPL-2.1)
 
-Files: src/client/hadoop/ceph
-Copyright: Copyright (C) New Dream Network and contributors
-License: Apache License v2
-
 Files: src/mount/canonicalize.c
 Copyright: Copyright (C) 1993 Rick Sladkey <[email protected]>
 License: LGPL2 or later

diff --git a/do_autogen.sh b/do_autogen.sh
@@ -10,7 +10,6 @@ do_autogen.sh: make a ceph build by running autogen, etc.
                                  level 1: -g
                                  level 3: -Wextra
                                  level 4: even more...
--H                               --with-hadoop
 -T                               --without-tcmalloc
 -e <path>                        dump encoded objects to <path>
 -P                               profiling build
@@ -46,8 +45,6 @@ do
     h) usage
         exit 0;;
 
-    H) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --with-hadoop";;
-
     T) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --without-tcmalloc";;
 
     j) CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-cephfs-java";;

diff --git a/doc/rados/troubleshooting/log-and-debug.rst b/doc/rados/troubleshooting/log-and-debug.rst
@@ -243,7 +243,7 @@ to their default level or to a level suitable for normal operations.
 +--------------------+-----------+--------------+
 | ``rgw``            |     1     |      5       |
 +--------------------+-----------+--------------+
-| ``hadoop``         |     1     |      5       |
+| ``javaclient``     |     1     |      5       |
 +--------------------+-----------+--------------+
 | ``asok``           |     1     |      5       |
 +--------------------+-----------+--------------+

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -96,25 +96,13 @@ bin_PROGRAMS += rbd-fuse
 endif # WITH_FUSE
 
 
-# libcephfs (this and libhadoopcephfs should go somewhere else in the future)
+# libcephfs (this should go somewhere else in the future)
 
 libcephfs_la_SOURCES = libcephfs.cc
 libcephfs_la_LIBADD = $(LIBCLIENT) $(LIBCOMMON) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
 libcephfs_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
 lib_LTLIBRARIES += libcephfs.la
 
-# order matters! this *must* come after libcephfs, or else you'll encounter something
-# like "error: relink libhadoopcephfs.la with the above command before installing it"
-if WITH_HADOOPCLIENT
-JAVA_BASE = /usr/lib/jvm/java-6-sun
-libhadoopcephfs_la_SOURCES = client/hadoop/CephFSInterface.cc
-libhadoopcephfs_la_LIBADD = $(LIBCEPHFS)
-libhadoopcephfs_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex 'hadoopcephfs_.*'
-lib_LTLIBRARIES += libhadoopcephfs.la
-noinst_HEADERS += client/hadoop/CephFSInterface.h
-endif # WITH_HADOOPCLIENT
-
-
 # jni library (java source is in src/java)
 
 if ENABLE_CEPHFS_JAVA