From 390779d1aa9b46648e4f5390dc431c255c70385d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 24 Oct 2017 15:20:49 -0500 Subject: [PATCH] ceph_test_objectstore: do not change model for 0-length zero We almost fixed this in the pr merged at 2dbbb351e2e0e3703880023bf51f55790f763e04 but missed this piece. Signed-off-by: Sage Weil --- src/test/objectstore/store_test.cc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 965e29ac0cea2..be8971b781c0b 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -3914,16 +3914,18 @@ public: len = ROUND_UP_TO(len, write_alignment); } - auto& data = contents[new_obj].data; - if (data.length() < offset + len) { - data.append_zero(offset+len-data.length()); + if (len > 0) { + auto& data = contents[new_obj].data; + if (data.length() < offset + len) { + data.append_zero(offset+len-data.length()); + } + bufferlist n; + n.substr_of(data, 0, offset); + n.append_zero(len); + if (data.length() > offset + len) + data.copy(offset + len, data.length() - offset - len, n); + data.swap(n); } - bufferlist n; - n.substr_of(data, 0, offset); - n.append_zero(len); - if (data.length() > offset + len) - data.copy(offset + len, data.length() - offset - len, n); - data.swap(n); t.zero(cid, new_obj, offset, len); ++in_flight; -- 2.39.5