RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Sage Weil 2011-06-01 16:23:17 -07:00
commit 59501e1d3f
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -7,7 +7,7 @@ AC_PREREQ(2.59)
# NOTE: This version is _only_ used for naming the tarball. The # NOTE: This version is _only_ used for naming the tarball. The
# VERSION define is not used by the code. It gets a version string # VERSION define is not used by the code. It gets a version string
# from 'git describe'; see src/ceph_ver.[ch] # from 'git describe'; see src/ceph_ver.[ch]
AC_INIT([ceph], [0.28.1], [ceph-devel@vger.kernel.org]) AC_INIT([ceph], [0.28.2], [ceph-devel@vger.kernel.org])
AC_CONFIG_SUBDIRS([src/gtest]) AC_CONFIG_SUBDIRS([src/gtest])

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ceph (0.28.2-1) experimental; urgency=low
* New upstream release.
-- Sage Weil <sage@newdream.net> Sat, 28 May 2011 09:14:17 -0700
ceph (0.28.1-1) experimental; urgency=low ceph (0.28.1-1) experimental; urgency=low
* New upstream release. * New upstream release.

1
debian/obsync.install vendored Normal file
View File

@ -0,0 +1 @@
usr/bin/obsync

8
src/osd/OSD.cc
View File

@ -4811,11 +4811,17 @@ void OSD::do_recovery(PG *pg)
do_queries(query_map); do_queries(query_map);
else { else {
dout(10) << "do_recovery no luck, giving up on this pg for now" << dendl; dout(10) << "do_recovery no luck, giving up on this pg for now" << dendl;
recovery_wq.lock();
pg->recovery_item.remove_myself(); // sigh... pg->recovery_item.remove_myself(); // sigh...
recovery_wq.unlock();
} }
} }
else if (started < max) else if (started < max) {
recovery_wq.lock();
pg->recovery_item.remove_myself(); pg->recovery_item.remove_myself();
recovery_wq.unlock();
}
pg->unlock(); pg->unlock();
} }

2
src/osd/PG.h
View File

@ -787,6 +787,8 @@ public:
interval_set<snapid_t> snap_trimq; interval_set<snapid_t> snap_trimq;
/* You should not use these items without taking their respective queue locks
* (if they have one) */
xlist<PG*>::item recovery_item, backlog_item, scrub_item, scrub_finalize_item, snap_trim_item, remove_item, stat_queue_item; xlist<PG*>::item recovery_item, backlog_item, scrub_item, scrub_finalize_item, snap_trim_item, remove_item, stat_queue_item;
int recovery_ops_active; int recovery_ops_active;
#ifdef DEBUG_RECOVERY_OIDS #ifdef DEBUG_RECOVERY_OIDS