[Pkg-ceph-commits] [ceph] 01/01: Imported Upstream version 0.80.7
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Wed Oct 15 18:08:39 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 b3f7bb0 (upstream)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Wed Oct 15 18:06:43 2014
Imported Upstream version 0.80.7
---
ceph.spec | 2 +-
configure | 22 +++++++++++-----------
configure.ac | 2 +-
src/.git_version | 4 ++--
src/osd/PG.cc | 1 -
src/osd/PGLog.cc | 3 ++-
src/osd/ReplicatedPG.cc | 11 ++++++++---
7 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/ceph.spec b/ceph.spec
index 20937c2..1e9a2a6 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -9,7 +9,7 @@
# common
#################################################################################
Name: ceph
-Version: 0.80.6
+Version: 0.80.7
Release: 0%{?dist}
Summary: User space components of the Ceph file system
License: GPL-2.0
diff --git a/configure b/configure
index 81da86d..d8d4d5c 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.6.
+# Generated by GNU Autoconf 2.68 for ceph 0.80.7.
#
# 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.6'
-PACKAGE_STRING='ceph 0.80.6'
+PACKAGE_VERSION='0.80.7'
+PACKAGE_STRING='ceph 0.80.7'
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.6 to adapt to many kinds of systems.
+\`configure' configures ceph 0.80.7 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.6:";;
+ short | recursive ) echo "Configuration of ceph 0.80.7:";;
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.6
+ceph configure 0.80.7
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2682,7 +2682,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.6, which was
+It was created by ceph $as_me 0.80.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -4682,7 +4682,7 @@ fi
# Define the identity of the package.
PACKAGE='ceph'
- VERSION='0.80.6'
+ VERSION='0.80.7'
cat >>confdefs.h <<_ACEOF
@@ -12660,7 +12660,7 @@ fi
# Define the identity of the package.
PACKAGE='ceph'
- VERSION='0.80.6'
+ VERSION='0.80.7'
cat >>confdefs.h <<_ACEOF
@@ -22464,7 +22464,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.6, which was
+This file was extended by ceph $as_me 0.80.7, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22530,7 +22530,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.6
+ceph config.status 0.80.7
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index eb16aa5..7255c7c 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.6], [ceph-devel at vger.kernel.org])
+AC_INIT([ceph], [0.80.7], [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 338f76a..1727fed 100644
--- a/src/.git_version
+++ b/src/.git_version
@@ -1,2 +1,2 @@
-f93610a4421cb670b08e974c6550ee715ac528ae
-v0.80.6
+6c0127fcb58008793d3c8b62d925bc91963672a3
+v0.80.7
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 11a34a2..9356df4 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1281,7 +1281,6 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id)
if (*i != CRUSH_ITEM_NONE)
++num_want_acting;
}
- assert(want_acting_backfill.size() - want_backfill.size() == num_want_acting);
// This is a bit of a problem, if we allow the pg to go active with
// want.size() < min_size, we won't consider the pg to have been
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 9523b12..3f61346 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -99,7 +99,8 @@ void PGLog::IndexedLog::trim(
unindex(e); // remove from index,
- if (e.version == rollback_info_trimmed_to_riter->version) {
+ if (rollback_info_trimmed_to_riter == log.rend() ||
+ e.version == rollback_info_trimmed_to_riter->version) {
log.pop_front();
rollback_info_trimmed_to_riter = log.rend();
} else {
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 5600466..d23e6fc 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5343,9 +5343,11 @@ struct C_Copyfrom : public Context {
hobject_t oid;
epoch_t last_peering_reset;
ceph_tid_t tid;
- C_Copyfrom(ReplicatedPG *p, hobject_t o, epoch_t lpr)
+ ReplicatedPG::CopyOpRef cop;
+ C_Copyfrom(ReplicatedPG *p, hobject_t o, epoch_t lpr,
+ const ReplicatedPG::CopyOpRef& c)
: pg(p), oid(o), last_peering_reset(lpr),
- tid(0)
+ tid(0), cop(c)
{}
void finish(int r) {
if (r == -ECANCELED)
@@ -5592,7 +5594,7 @@ void ReplicatedPG::_copy_some(ObjectContextRef obc, CopyOpRef cop)
&cop->rval);
C_Copyfrom *fin = new C_Copyfrom(this, obc->obs.oi.soid,
- get_last_peering_reset());
+ get_last_peering_reset(), cop);
gather.set_finisher(new C_OnFinisher(fin,
&osd->objecter_finisher));
@@ -6023,8 +6025,10 @@ void ReplicatedPG::cancel_copy(CopyOpRef cop, bool requeue)
if (cop->objecter_tid) {
Mutex::Locker l(osd->objecter_lock);
osd->objecter->op_cancel(cop->objecter_tid, -ECANCELED);
+ cop->objecter_tid = 0;
if (cop->objecter_tid2) {
osd->objecter->op_cancel(cop->objecter_tid2, -ECANCELED);
+ cop->objecter_tid2 = 0;
}
}
@@ -6440,6 +6444,7 @@ void ReplicatedPG::cancel_flush(FlushOpRef fop, bool requeue)
if (fop->objecter_tid) {
Mutex::Locker l(osd->objecter_lock);
osd->objecter->op_cancel(fop->objecter_tid, -ECANCELED);
+ fop->objecter_tid = 0;
}
if (requeue) {
if (fop->op)
--
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