[Pkg-ceph-commits] [ceph] 01/01: Imported Upstream version 0.80.4
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Thu Jul 17 09:53:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch upstream
in repository ceph.
commit c269308 (upstream)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Thu Jul 17 09:52:10 2014
Imported Upstream version 0.80.4
---
ceph.spec | 2 +-
configure | 22 +++++++++++-----------
configure.ac | 2 +-
src/.git_version | 4 ++--
src/common/config_opts.h | 6 ++++++
src/os/XfsFileStoreBackend.cc | 19 ++++++++++++-------
src/rgw/rgw_rados.cc | 3 ++-
7 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/ceph.spec b/ceph.spec
index 20c0dad..19040e7 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -9,7 +9,7 @@
# common
#################################################################################
Name: ceph
-Version: 0.80.3
+Version: 0.80.4
Release: 0%{?dist}
Summary: User space components of the Ceph file system
License: GPL-2.0
diff --git a/configure b/configure
index e476e1c..faa4bfc 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ceph 0.80.3.
+# Generated by GNU Autoconf 2.68 for ceph 0.80.4.
#
# Report bugs to <ceph-devel at vger.kernel.org>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ceph'
PACKAGE_TARNAME='ceph'
-PACKAGE_VERSION='0.80.3'
-PACKAGE_STRING='ceph 0.80.3'
+PACKAGE_VERSION='0.80.4'
+PACKAGE_STRING='ceph 0.80.4'
PACKAGE_BUGREPORT='ceph-devel at vger.kernel.org'
PACKAGE_URL=''
@@ -1441,7 +1441,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ceph 0.80.3 to adapt to many kinds of systems.
+\`configure' configures ceph 0.80.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1512,7 +1512,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ceph 0.80.3:";;
+ short | recursive ) echo "Configuration of ceph 0.80.4:";;
esac
cat <<\_ACEOF
@@ -1657,7 +1657,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ceph configure 0.80.3
+ceph configure 0.80.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2504,7 +2504,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ceph $as_me 0.80.3, which was
+It was created by ceph $as_me 0.80.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -4504,7 +4504,7 @@ fi
# Define the identity of the package.
PACKAGE='ceph'
- VERSION='0.80.3'
+ VERSION='0.80.4'
cat >>confdefs.h <<_ACEOF
@@ -12482,7 +12482,7 @@ fi
# Define the identity of the package.
PACKAGE='ceph'
- VERSION='0.80.3'
+ VERSION='0.80.4'
cat >>confdefs.h <<_ACEOF
@@ -22258,7 +22258,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ceph $as_me 0.80.3, which was
+This file was extended by ceph $as_me 0.80.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22324,7 +22324,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ceph config.status 0.80.3
+ceph config.status 0.80.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index cf8bd38..87c9d54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ(2.59)
# VERSION define is not used by the code. It gets a version string
# from 'git describe'; see src/ceph_ver.[ch]
-AC_INIT([ceph], [0.80.3], [ceph-devel at vger.kernel.org])
+AC_INIT([ceph], [0.80.4], [ceph-devel at vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0
diff --git a/src/.git_version b/src/.git_version
index 6c56b55..9bacb77 100644
--- a/src/.git_version
+++ b/src/.git_version
@@ -1,2 +1,2 @@
-a129e85cdc3446a427fffffe4c31617d49024946
-v0.80.3
+7c241cfaa6c8c068bc9da8578ca00b9f4fc7567f
+v0.80.4
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 2c65e6c..f8dd5f0 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -651,6 +651,12 @@ OPTION(filestore_btrfs_clone_range, OPT_BOOL, true)
OPTION(filestore_zfs_snap, OPT_BOOL, false) // zfsonlinux is still unstable
OPTION(filestore_fsync_flushes_journal_data, OPT_BOOL, false)
OPTION(filestore_fiemap, OPT_BOOL, false) // (try to) use fiemap
+
+// (try to) use extsize for alloc hint
+// WARNING: extsize seems to trigger data corruption in xfs -- that is why it is
+// off by default, see bug #8830
+OPTION(filestore_xfs_extsize, OPT_BOOL, false)
+
OPTION(filestore_journal_parallel, OPT_BOOL, false)
OPTION(filestore_journal_writeahead, OPT_BOOL, false)
OPTION(filestore_journal_trailing, OPT_BOOL, false)
diff --git a/src/os/XfsFileStoreBackend.cc b/src/os/XfsFileStoreBackend.cc
index ba51e6b..e4d4aad 100644
--- a/src/os/XfsFileStoreBackend.cc
+++ b/src/os/XfsFileStoreBackend.cc
@@ -106,15 +106,20 @@ int XfsFileStoreBackend::detect_features()
goto out_close;
}
- ret = set_extsize(fd, 1U << 15); // a few pages
- if (ret) {
- ret = 0;
- dout(0) << "detect_feature: failed to set test file extsize, assuming extsize is NOT supported" << dendl;
- goto out_close;
+ if (g_conf->filestore_xfs_extsize) {
+ ret = set_extsize(fd, 1U << 15); // a few pages
+ if (ret) {
+ ret = 0;
+ dout(0) << "detect_feature: failed to set test file extsize, assuming extsize is NOT supported" << dendl;
+ goto out_close;
+ } else {
+ dout(0) << "detect_feature: extsize is supported" << dendl;
+ m_has_extsize = true;
+ }
+ } else {
+ dout(0) << "detect_feature: extsize is disabled by conf" << dendl;
}
- dout(0) << "detect_feature: extsize is supported" << dendl;
- m_has_extsize = true;
out_close:
TEMP_FAILURE_RETRY(::close(fd));
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 30335c4..be8248e 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1693,7 +1693,8 @@ int RGWRados::open_bucket_data_ctx(rgw_bucket& bucket, librados::IoCtx& data_ctx
int RGWRados::open_bucket_data_extra_ctx(rgw_bucket& bucket, librados::IoCtx& data_ctx)
{
- int r = open_bucket_pool_ctx(bucket.name, bucket.data_extra_pool, data_ctx);
+ string& pool = (!bucket.data_extra_pool.empty() ? bucket.data_extra_pool : bucket.data_pool);
+ int r = open_bucket_pool_ctx(bucket.name, pool, data_ctx);
if (r < 0)
return r;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list