Wip xio

.gitignore

@@ -52,6 +52,9 @@ missing
 py-compile
 release
 stamp-h1
+systemd/[email protected]
+systemd/ceph-rgw.tmpfiles.d
+systemd/Makefile
 vgcore.*
 
 # specific local dir files
@@ -64,7 +67,7 @@ vgcore.*
 /ceph-[0-9]*/
 
 # M4 Macro directory
-m4/
+/m4/
 
 # where is this from?
 web/*.html

.gitmodule_mirrors

@@ -2,10 +2,10 @@
 # Only used by autobuild-ceph.
 ceph-object-corpus git://apt-mirror.front.sepia.ceph.com/ceph-object-corpus.git
 src/civetweb git://apt-mirror.front.sepia.ceph.com/civetweb.git
-src/libs3 git://apt-mirror.front.sepia.ceph.com/libs3.git
 src/mongoose git://apt-mirror.front.sepia.ceph.com/mongoose.git
 src/leveldb git://apt-mirror.front.sepia.ceph.com/leveldb.git
 src/erasure-code/jerasure/jerasure git://apt-mirror.front.sepia.ceph.com/jerasure.git
 src/erasure-code/jerasure/gf-complete git://apt-mirror.front.sepia.ceph.com/gf-complete.git
 src/rocksdb git://apt-mirror.front.sepia.ceph.com/rocksdb.git
 ceph-erasure-code-corpus git://apt-mirror.front.sepia.ceph.com/ceph-erasure-code-corpus.git
+src/gmock git://apt-mirror.front.sepia.ceph.com/gmock.git

.gitmodules

@@ -1,12 +1,9 @@
 [submodule "ceph-object-corpus"]
 	path = ceph-object-corpus
-	url = git://ceph.com/git/ceph-object-corpus.git
-[submodule "src/libs3"]
-	path = src/libs3
-	url = git://github.com/ceph/libs3.git
+	url = https://github.com/ceph/ceph-object-corpus.git
 [submodule "src/civetweb"]
 	path = src/civetweb
-	url = git://github.com/ceph/civetweb
+	url = https://github.com/ceph/civetweb
 [submodule "src/erasure-code/jerasure/jerasure"]
 	path = src/erasure-code/jerasure/jerasure
 	url = https://github.com/ceph/jerasure.git
@@ -17,9 +14,12 @@
 	branch = v2-ceph
 [submodule "src/rocksdb"]
 	path = src/rocksdb
-	url = git://github.com/ceph/rocksdb
+	url = https://github.com/ceph/rocksdb
 	ignore = dirty
 [submodule "ceph-erasure-code-corpus"]
 	path = ceph-erasure-code-corpus
 	url = https://github.com/ceph/ceph-erasure-code-corpus.git
-
+[submodule "src/gmock"]
+	path = src/gmock
+	url = https://github.com/ceph/gmock.git
+        branch = ceph-release-1.7.0

.peoplemap

@@ -16,12 +16,13 @@
 # git log --pretty='%aN <%aE>' $range | git -c mailmap.file=.peoplemap check-mailmap --stdin | sort | uniq | sed -e 's/\(.*\) \(<.*\)/\2 \1/' | uniq --skip-field=1 --all-repeated | sed -e 's/\(.*>\) \(.*\)/\2 \1/'
 #
 Alexandre Marangone <[email protected]> Alexandre Marangone <[email protected]>
-Alfredo Deza <[email protected]> Alfreda Deza <[email protected]>
+Alfredo Deza <[email protected]> Alfredo Deza <[email protected]>
 Dan Mick <[email protected]> Dan Mick <[email protected]>
 David Zafman <[email protected]> David Zafman <[email protected]>
 Greg Farnum <[email protected]> Greg Farnum <[email protected]>
 Ilya Dryomov <[email protected]> Ilya Dryomov <[email protected]>
-João Eduardo Luís <[email protected]> João Eduardo Luís <[email protected]>
+Joao Eduardo Luis <[email protected]> João Eduardo Luís <[email protected]>
+Joao Eduardo Luis <[email protected]> João Eduardo Luís <[email protected]>
 John Spray <[email protected]> John Spray <[email protected]>
 John Wilkins <[email protected]> John Wilkins <[email protected]>
 Josh Durgin <[email protected]> Josh Durgin <[email protected]>
@@ -34,14 +35,12 @@ Noah Watkins <[email protected]> Noah Watkins <[email protected]>
 Patrick McGarry <[email protected]> Patrick McGarry <[email protected]>
 Ross Turk <[email protected]> Ross Turk <[email protected]>
 Sage Weil <[email protected]> Sage Weil <[email protected]>
+Sahid Orentino Ferdjaoui <[email protected]> Sahid Orentino Ferdjaoui <[email protected]>
 Samuel Just <[email protected]> Samuel Just <[email protected]>
 Sandon Van Ness <[email protected]> Sandon Van Ness <[email protected]>
 Tamil Muthamizhan <[email protected]> Tamil Muthamizhan <[email protected]>
 Tyler Brekke <[email protected]> Tyler Brekke <[email protected]>
 Warren Usui <[email protected]> Warren Usui <[email protected]>
-Yehuda Sadeh <[email protected]> Yehuda Sadeh <[email protected]>
-John Wilkins <[email protected]> John Wilkins <[email protected]>
 Yan, Zheng <[email protected]> Yan, Zheng <[email protected]>
-Sahid Orentino Ferdjaoui <[email protected]> Sahid Orentino Ferdjaoui <[email protected]>
-João Eduardo Luís <[email protected]> João Eduardo Luís <[email protected]>
-Ilya Dryomov <[email protected]> Ilya Dryomov <[email protected]>
+Yehuda Sadeh <[email protected]> Yehuda Sadeh <[email protected]>
+Yuri Weinstein <[email protected]> Yuri Weinstein <[email protected]>

CMakeLists.txt

@@ -0,0 +1,248 @@
+cmake_minimum_required(VERSION 2.8.11)
+
+project(Ceph)
+set(VERSION "0.90")
+
+if (NOT (CMAKE_MAJOR_VERSION LESS 3))
+  # Tweak policies (this one disables "missing" dependency warning)
+  cmake_policy(SET CMP0046 OLD)
+endif(NOT (CMAKE_MAJOR_VERSION LESS 3))
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+
+include_directories(  
+  ${PROJECT_BINARY_DIR}/src/include
+  ${OFED_PREFIX}/include
+  ${LEVELDB_PREFIX}/include
+  ${PROJECT_SOURCE_DIR}/src
+)
+
+link_directories(
+  ${OFED_PREFIX}/lib
+  ${LEVELDB_PREFIX}/lib
+)
+
+#Check Includes
+include(CheckIncludeFiles)
+include(CheckIncludeFileCXX)
+include(CheckFunctionExists)
+
+CHECK_FUNCTION_EXISTS(fallocate CEPH_HAVE_FALLOCATE)
+CHECK_FUNCTION_EXISTS(posix_fadvise HAVE_POSIX_FADVISE)
+CHECK_FUNCTION_EXISTS(posix_fallocate HAVE_POSIX_FALLOCATE)
+CHECK_FUNCTION_EXISTS(syncfs HAVE_SYS_SYNCFS) 
+CHECK_FUNCTION_EXISTS(sync_file_range HAVE_SYNC_FILE_RANGE)
+CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
+CHECK_INCLUDE_FILES("boost/random/discrete_distribution.hpp" HAVE_BOOST_RANDOM_DISCRETE_DISTRIBUTION)
+CHECK_INCLUDE_FILES("dirent.h" HAVE_DIRENT_H)
+CHECK_INCLUDE_FILES("dlfcn.h" HAVE_DLFCN_H)
+CHECK_INCLUDE_FILES("inttypes.h" HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILES("linux/types.h" HAVE_LINUX_TYPES_H)
+CHECK_INCLUDE_FILES("leveldb/filter_policy.h" HAVE_LEVELDB_FILTER_POLICY)
+CHECK_INCLUDE_FILES("memory.h" HAVE_MEMORY_H)
+CHECK_INCLUDE_FILES("ndir.h" HAVE_NDIR_H)
+CHECK_INCLUDE_FILES("netdb.h" HAVE_NETDB_H)
+CHECK_INCLUDE_FILES("netinet/in.h" HAVE_NETINET_IN_H)
+CHECK_INCLUDE_FILES("stdint.h" HAVE_STDINT_H)
+CHECK_INCLUDE_FILES("stdlib.h" HAVE_STDLIB_H)
+CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
+CHECK_INCLUDE_FILES("strings.h" HAVE_STRINGS_H)
+CHECK_INCLUDE_FILES("string.h" HAVE_STRING_H)
+CHECK_INCLUDE_FILES("syslog.h" HAVE_SYSLOG_H)
+CHECK_INCLUDE_FILES("sys/dir.h" HAVE_SYS_DIR_H)
+CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H)
+CHECK_INCLUDE_FILES("sys/ioctl.h" HAVE_SYS_IOCTL_H)
+CHECK_INCLUDE_FILES("sys/mount.h" HAVE_SYS_MOUNT_H)
+CHECK_INCLUDE_FILES("sys/ndir.h" HAVE_SYS_NDIR_H)
+CHECK_INCLUDE_FILES("sys/param.h" HAVE_SYS_PARAM_H)
+CHECK_INCLUDE_FILES("sys/socket.h" HAVE_SYS_SOCKET_H)
+CHECK_INCLUDE_FILES("sys/statvfs.h" HAVE_SYS_STATVFS_H)
+CHECK_INCLUDE_FILES("sys/stat.h" HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILES("sys/time.h" HAVE_SYS_TIME_H)
+CHECK_INCLUDE_FILES("sys/types.h" HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILES("sys/vfs.h" HAVE_SYS_VFS_H)
+CHECK_INCLUDE_FILES("sys/wait.h" HAVE_SYS_WAIT_H)
+CHECK_INCLUDE_FILES("sys/xattr.h" HAVE_SYS_XATTR_H)
+CHECK_INCLUDE_FILES("unistd.h" HAVE_UNISTD_H)
+CHECK_INCLUDE_FILES("utime.h" HAVE_UTIME_H)
+CHECK_INCLUDE_FILES("${CMAKE_SOURCE_DIR}/src/include/fiemap.h" HAVE_FIEMAP_H)
+CHECK_INCLUDE_FILES("expat.h" HAVE_EXPAT_H)
+CHECK_INCLUDE_FILES("fuse/fuse_lowlevel.h" HAVE_FUSE_LOWLEVEL_H)
+CHECK_INCLUDE_FILES("curl/curl.h" HAVE_FUSE_LOWLEVEL_H)
+CHECK_INCLUDE_FILES("fuse/fuse.h" HAVE_FUSE_H)
+CHECK_INCLUDE_FILES("google/profiler.h" HAVE_PROFILER_H)
+CHECK_INCLUDE_FILES("libedit/vis.h" HAVE_LIBEDIT_VIS_H)
+CHECK_INCLUDE_FILES("fcgi_config.h"  HAVE_FASTCGI_CONFIG_H)
+CHECK_INCLUDE_FILES("fastcgi.h" HAVE_FASTCGI_H)
+CHECK_INCLUDE_FILES("fcgiapp.h" FASTCGI_FASTCGI_APP_DIR)
+CHECK_INCLUDE_FILES("fcgimisc.h" HAVE_FASTCGI_MISC_H)
+CHECK_INCLUDE_FILES("fcgio.h" HAVE_FASTCGIO_H)
+CHECK_INCLUDE_FILES("fcgios.h" FASTCGI_FASTCGIOS_DIR)
+CHECK_INCLUDE_FILES("fcgi_stdio.h" HAVE_FASTCGI_STDIO_H)
+CHECK_INCLUDE_FILES("openssl/ssl.h" HAVE_SSL_H)
+CHECK_INCLUDE_FILES("snappy.h" HAVE_SNAPPY_H)
+CHECK_INCLUDE_FILES("uuid/uuid.h" HAVE_UUID_H)
+CHECK_INCLUDE_FILES("atomic_ops.h" HAVE_ATOMIC_OPS)
+CHECK_INCLUDE_FILES("keyutils.h" HAVE_KEYUTILS_H)
+
+include(CheckSymbolExists)
+CHECK_SYMBOL_EXISTS(__u8 "sys/types.h;linux/types.h" HAVE___U8)
+CHECK_SYMBOL_EXISTS(__u64 "sys/types.h;linux/types.h" HAVE___U64)
+CHECK_SYMBOL_EXISTS(__s64 "sys/types.h;linux/types.h" HAVE___S64)
+
+set(CEPH_MAN_DIR "share/man" CACHE STRING "Install location for man pages (relative to prefix).")
+
+option(ENABLE_SHARED "build shared libraries" ON)
+if(${ENABLE_SHARED})
+ set(CEPH_SHARED SHARED)
+else(${ENABLE_SHARED})
+ set(CEPH_SHARED STATIC)
+endif(${ENABLE_SHARED})
+
+find_package(udev REQUIRED)
+set(HAVE_UDEV ${UDEV_FOUND})
+message(STATUS "${UDEV_LIBS}")
+
+option(WITH_AIO "AIO is here ON" ON)
+if(${WITH_AIO})
+find_package(aio REQUIRED)
+set(HAVE_LIBAIO ${AIO_FOUND})
+message(STATUS "${AIO_LIBS}")
+endif(${WITH_AIO})
+
+option(WITH_FUSE "Fuse is here" ON)
+if(${WITH_FUSE})
+find_package(fuse REQUIRED)
+set(HAVE_LIBFUSE ${FUSE_FOUND})
+CHECK_FUNCTION_EXISTS(fuse_getgroups HAVE_FUSE_GETGROUPS)
+endif(${WITH_FUSE})
+
+find_package(blkid REQUIRED)
+set(HAVE_LIBBLKID ${BLKID_FOUND})
+
+# probably fuse etc need this -- how to check? XXX
+option(WITH_MDS "MDS is here" ON)
+
+# needs mds and? XXX
+option(WITH_CLIENT "Client is here" ON)
+option(WITH_LIBCEPHFS "libcephfs client library" ON)
+
+# key-value store
+option(WITH_KVS "Key value store is here" ON)
+
+# remote block storage
+option(WITH_RBD "Remote block storage is here" ON)
+
+option(WITH_LEVELDB "LevelDB is here" ON)
+if(${WITH_LEVELDB})
+find_package(leveldb REQUIRED)
+set(HAVE_LIBLEVELDB ${LEVELDB_FOUND})
+CHECK_INCLUDE_FILES("leveldb/filter_policy.h" HAVE_LEVELDB_FILTER_POLICY)
+endif(${WITH_LEVELDB})
+
+option(WITH_EXPAT "EXPAT is here" ON)
+if(${WITH_EXPAT})
+find_package(expat REQUIRED)
+set(HAVE_EXPAT ${EXPAT_FOUND})
+endif(${WITH_EXPAT})
+
+option(WITH_FCGI "FCGI is here" ON)
+if(${WITH_FCGI})
+find_package(fcgi REQUIRED)
+set(HAVE_FCGI ${FCGI_FOUND})
+endif(${WITH_FCGI})
+
+option(WITH_ATOMICS_OPS "Atomic Ops is here" ON)
+if(${WITH_ATOMIC_OPS})
+find_package(atomic_ops REQUIRED)
+set(HAVE_ATOMIC_OPS ${ATOMIC_OPS_FOUND})
+endif(${WITH_ATOMIC_OPS})
+
+option(WITH_PROFILER "The Profiler is here" ON)
+if(${WITH_PROFILER})
+find_package(profiler REQUIRED)
+set(HAVE_PROFILER ${PROFILER_FOUND})
+endif(${WITH_PROFILER})
+
+option(WITH_SNAPPY "Snappy is here" ON)
+if(${WITH_SNAPPY})
+find_package(snappy REQUIRED)
+set(HAVE_LIBSNAPPY ${SNAPPY_FOUND})
+endif(${WITH_SNAPPY})
+
+option(WITH_TCMALLOC "Use TCMalloc as Allocator" ON)
+if(${WITH_TCMALLOC})
+find_package(tcmalloc REQUIRED)
+set(HAVE_LIBTCMALLOC ${Tcmalloc_FOUND})
+endif(${WITH_TCMALLOC})
+
+option(USE_CRYPTOPP "Cryptopp is ON" ON)
+find_package(cryptopp)
+if(CRYPTOPP_FOUND)
+        MESSAGE(STATUS "${CRYPTOPP_LIBRARIES}")
+        set(CRYPTO_LIBS ${CRYPTOPP_LIBRARIES})
+	set(USE_NSS 0)
+else()
+        MESSAGE(STATUS "Cryptopp not found using NSS instead")
+        find_package(NSS)
+        if(NSS_FOUND)
+		set(USE_NSS 1)
+		set(USE_CRYPTOPP 0)
+		find_package(NSPR)
+		if(NSPR_FOUND)
+			set(CRYPTO_LIBS ${NSS_LIBRARIES} ${NSPR_LIBRARIES})
+			#MESSAGE(STATUS "${CRYPTO_LIBS}")
+			#MESSAGE(STATUS "${NSS_INCLUDE_DIR} ${NSPR_INCLUDE_DIR}")
+		endif(NSPR_FOUND)
+	endif(NSS_FOUND)
+endif(CRYPTOPP_FOUND)
+
+option(WITH_XIO "Enable XIO messaging" ON)
+if(WITH_XIO)
+find_package(xio)
+set(HAVE_XIO ${Xio_FOUND})
+endif(WITH_XIO)
+
+#option for RGW
+option(WITH_RADOSGW "Rados Gateway is enabled" ON)
+
+#option for CephFS
+option(WITH_CEPHFS "CephFS is enabled" ON)
+
+# Now create a useable config.h
+configure_file(
+  ${PROJECT_SOURCE_DIR}/src/include/config-h.in.cmake
+  ${PROJECT_BINARY_DIR}/include/acconfig.h
+)
+include_directories(${PROJECT_BINARY_DIR}/include)
+
+add_definitions(-D__linux__)
+
+if(${ENABLE_SHARED})
+  set(Boost_USE_STATIC_LIBS   OFF)
+else(${ENABLE_SHARED})
+  set(Boost_USE_STATIC_LIBS   ON)
+endif(${ENABLE_SHARED})
+
+set(Boost_USE_MULTITHREADED ON)
+find_package(Boost COMPONENTS thread system regex REQUIRED)
+include_directories(${Boost_INCLUDE_DIRS})
+
+find_package(Threads REQUIRED)
+
+# find out which platform we are building on
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(LINUX ON)
+  set(UNIX ON)
+  FIND_PACKAGE(Threads)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+# find out which platform we are building on
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+set(OperatingSystem "Mac OS X")  
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+add_subdirectory(src)
+
+# man pages must be preprocessed, not supported yet
+#add_subdirectory(man)

CONTRIBUTING.rst

@@ -6,5 +6,13 @@ For documentation patches the the following guide will help you get started
 
 `Documenting Ceph`_
 
+Performance enhancements must come with test data and detailed
+explanations.
+
+Code cleanup is appreciated along with a patch that fixes a bug or
+implements a feature. Except on rare occasions, code cleanup that only
+involve coding style or whitespace modifications are discouraged,
+primarily because they cause problems when rebasing and backporting.
+
 .. _Submitting Patches: SubmittingPatches
 .. _Documenting Ceph:  doc/start/documenting-ceph.rst

COPYING

@@ -11,13 +11,16 @@ Files: doc/*
 Copyright: (c) 2010-2012 New Dream Network and contributors
 License: Creative Commons Attribution-ShareAlike (CC BY-SA)
 
+Files: bin/git-archive-all.sh
+License: GPL3
+
 Files: src/mount/canonicalize.c
 Copyright: Copyright (C) 1993 Rick Sladkey <[email protected]>
 License: LGPL2 or later
 
 Files: src/os/btrfs_ioctl.h
 Copyright: Copyright (C) 2007 Oracle.  All rights reserved.
-License: GPL2
+License: GPL2 (see COPYING-GPL2)
 
 Files: src/include/ceph_hash.cc
 Copyright: None