summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-12-13 16:26:43 -0800
committerSage Weil <sage@inktank.com>2012-12-13 16:27:09 -0800
commitc9894ff0e5782e43d5efa457d5bff5a9b2312274 (patch)
treed0a40a50434d14319ee98535307d934453fc7e06
parente3ed28eb2d33cf8c5bc8a36af919e6a8e566ad6b (diff)
downloadceph-c9894ff0e5782e43d5efa457d5bff5a9b2312274.tar.gz
osd: up != acting okay on mkpg
This can happen when: - mon sends create pg - it gets created - osd remaps the pg to a different osd but osd does not update pg status to the mon - mkpg resent to the new osd or something along those lines. It seems unusual, but in the end who really cares why the mon doesn't know about the pg creation yet. Note that this check was added in the initial commit where acting/up was added; there is no specific condition of concern we are protecting against. Instead, ignore the message. We'll get a query soon anwyay. This 'fixes' #3614. Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/OSD.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 92092969ea0..421d7e1af32 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4756,9 +4756,9 @@ void OSD::handle_pg_create(OpRequestRef op)
continue;
}
if (up != acting) {
- dout(10) << "mkpg " << pgid << " up " << up << " != acting " << acting << dendl;
- clog.error() << "mkpg " << pgid << " up " << up << " != acting "
- << acting << "\n";
+ dout(10) << "mkpg " << pgid << " up " << up << " != acting " << acting << ", ignoring" << dendl;
+ // we'll get a query soon anyway, since we know the pg
+ // must exist. we can ignore this.
continue;
}