projects
/
ceph.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e35254c
)
osd: add creating to pg_string_state
24602/head
author
Dan van der Ster
<daniel.vanderster@cern.ch>
Tue, 25 Sep 2018 08:39:37 +0000
(10:39 +0200)
committer
Prashant D
<pdhange@redhat.com>
Mon, 15 Oct 2018 22:35:31 +0000
(
00:35
+0200)
Fixes: http://tracker.ceph.com/issues/36174
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit
d38f6a11701ec788e4d384aa5b0ae65b8e57da64
)
Conflicts:
src/osd/osd_types.cc : Resolved in pg_string_state
src/osd/osd_types.cc
patch
|
blob
|
history
diff --git
a/src/osd/osd_types.cc
b/src/osd/osd_types.cc
index 194b020ff206c2f82683d0faa3df26ecf19ae2c5..7b62acf570aa4d9ea3c5279070f7159d787756cc 100644
(file)
--- a/
src/osd/osd_types.cc
+++ b/
src/osd/osd_types.cc
@@
-916,6
+916,8
@@
boost::optional<uint64_t> pg_string_state(const std::string& state)
type = PG_STATE_SNAPTRIM_WAIT;
else if (state == "snaptrim_error")
type = PG_STATE_SNAPTRIM_ERROR;
+ else if (state == "creating")
+ type = PG_STATE_CREATING;
else
type = boost::none;
return type;