RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gh/next'

Browse Source
This commit is contained in:
Sage Weil 2015-05-05 09:53:51 -07:00
commit 7f209b4bc8
7 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = gnu
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = autogen.sh ceph.spec.in ceph.spec install-deps.sh
# the "." here makes sure check-local builds gtest and gmock before they are used
SUBDIRS = . src man
SUBDIRS = . src man doc
EXTRA_DIST += \
src/test/run-cli-tests \

7
configure.ac
View File

@ -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.94], [ceph-devel@vger.kernel.org])
AC_INIT([ceph], [9.0.0], [ceph-devel@vger.kernel.org])
# Create release string. Used with VERSION for RPMs.
RPM_RELEASE=0
@ -22,9 +22,7 @@ fi
AC_MSG_NOTICE([RPM_RELEASE='$RPM_RELEASE'])
AC_CHECK_PROGS(SPHINX_BUILD, sphinx-1.0-build sphinx-build, no)
if test x"$SPHINX_BUILD" = x"no"; then
AC_MSG_ERROR([sphinx-build not found (python-sphinx)])
fi
AM_CONDITIONAL(HAS_SPHINX_BUILD, test x"$SPHINX_BUILD" != "xno")
AC_CONFIG_MACRO_DIR([m4])
@ -1215,5 +1213,6 @@ AC_CONFIG_FILES([Makefile
src/java/Makefile
src/tracing/Makefile
man/Makefile
doc/Makefile
ceph.spec])
AC_OUTPUT

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ceph (9.0.0-1) stable; urgency=low
* New upstream release
-- Alfredo Deza <adeza@redhat.com> Mon, 04 May 2015 12:32:58 -0700
ceph (0.94-1) stable; urgency=low
* New upstream release

32
doc/Makefile.am Normal file
View File

@ -0,0 +1,32 @@
EXTRA_DIST = \
man/8/ceph-authtool.rst \
man/8/ceph-clsinfo.rst \
man/8/ceph-conf.rst \
man/8/ceph-debugpack.rst \
man/8/ceph-dencoder.rst \
man/8/ceph-deploy.rst \
man/8/ceph-disk.rst \
man/8/cephfs.rst \
man/8/ceph-fuse.rst \
man/8/ceph-mds.rst \
man/8/ceph-mon.rst \
man/8/ceph-osd.rst \
man/8/ceph-post-file.rst \
man/8/ceph-rbdnamer.rst \
man/8/ceph-rest-api.rst \
man/8/ceph.rst \
man/8/ceph-run.rst \
man/8/ceph-syn.rst \
man/8/crushtool.rst \
man/8/librados-config.rst \
man/8/monmaptool.rst \
man/8/mount.ceph.rst \
man/8/osdmaptool.rst \
man/8/radosgw-admin.rst \
man/8/radosgw.rst \
man/8/rados.rst \
man/8/rbd-fuse.rst \
man/8/rbd-replay-many.rst \
man/8/rbd-replay-prep.rst \
man/8/rbd-replay.rst \
man/8/rbd.rst

2
man/Makefile.am
View File

@ -4,6 +4,7 @@ EXTRA_DIST = conf.py
dist_man_MANS =
if HAS_SPHINX_BUILD
if ENABLE_CLIENT
include Makefile-client.am
endif
@ -27,3 +28,4 @@ clean-local:
@rm -rf doctrees
MAINTAINERCLEANFILES = $(dist_man_MANS)
endif

3
src/crush/CrushWrapper.cc
View File

@ -72,7 +72,7 @@ bool CrushWrapper::has_v4_buckets() const
crush_bucket *b = crush->buckets[i];
if (!b)
continue;
if (b->type == CRUSH_BUCKET_STRAW2)
if (b->alg == CRUSH_BUCKET_STRAW2)
return true;
}
return false;
@ -1438,6 +1438,7 @@ void CrushWrapper::dump_tunables(Formatter *f) const
f->dump_int("require_feature_tunables3", (int)has_nondefault_tunables3());
f->dump_int("has_v2_rules", (int)has_v2_rules());
f->dump_int("has_v3_rules", (int)has_v3_rules());
f->dump_int("has_v4_buckets", (int)has_v4_buckets());
}
void CrushWrapper::dump_rules(Formatter *f) const

3
src/librbd/ImageWatcher.cc
View File

@ -185,6 +185,8 @@ int ImageWatcher::request_lock(
bool request_pending = !m_aio_requests.empty();
ldout(m_image_ctx.cct, 15) << "queuing aio request: " << c
<< dendl;
c->get();
m_aio_requests.push_back(std::make_pair(restart_op, c));
if (request_pending) {
return 0;
@ -556,6 +558,7 @@ void ImageWatcher::retry_aio_requests() {
ldout(m_image_ctx.cct, 20) << "retrying aio request: " << iter->second
<< dendl;
iter->first(iter->second);
iter->second->put();
}
}