1 diff -ur ceph-0.94.10/src/client/SyntheticClient.cc ceph-0.94.10-cxx/src/client/SyntheticClient.cc
2 --- ceph-0.94.10/src/client/SyntheticClient.cc 2017-02-21 16:13:19.000000000 +0100
3 +++ ceph-0.94.10-cxx/src/client/SyntheticClient.cc 2017-04-29 12:25:26.633497617 +0200
5 int size = iargs.front(); iargs.pop_front();
6 int inflight = iargs.front(); iargs.pop_front();
8 - dout(2) << "createobjects " << cout << " of " << size << " bytes"
9 + dout(2) << "createobjects " << cout.rdbuf() << " of " << size << " bytes"
10 << ", " << inflight << " in flight" << dendl;
11 create_objects(count, size, inflight);
14 int rskew = iargs.front(); iargs.pop_front();
15 int wskew = iargs.front(); iargs.pop_front();
17 - dout(2) << "objectrw " << cout << " " << size << " " << wrpc
18 + dout(2) << "objectrw " << cout.rdbuf() << " " << size << " " << wrpc
19 << " " << overlap << " " << rskew << " " << wskew << dendl;
20 object_rw(count, size, wrpc, overlap, rskew, wskew);
22 diff -ur ceph-0.94.10/src/common/admin_socket.cc ceph-0.94.10-cxx/src/common/admin_socket.cc
23 --- ceph-0.94.10/src/common/admin_socket.cc 2017-02-21 16:13:19.000000000 +0100
24 +++ ceph-0.94.10-cxx/src/common/admin_socket.cc 2017-04-29 09:57:25.062251956 +0200
27 cmdvec.push_back(cmd);
28 if (!cmdmap_from_json(cmdvec, &cmdmap, errss)) {
29 - ldout(m_cct, 0) << "AdminSocket: " << errss << dendl;
30 + ldout(m_cct, 0) << "AdminSocket: " << errss.rdbuf() << dendl;
33 cmd_getval(m_cct, cmdmap, "format", format);
34 diff -ur ceph-0.94.10/src/common/ceph_json.h ceph-0.94.10-cxx/src/common/ceph_json.h
35 --- ceph-0.94.10/src/common/ceph_json.h 2017-02-21 16:13:19.000000000 +0100
36 +++ ceph-0.94.10-cxx/src/common/ceph_json.h 2017-04-29 11:13:38.925899980 +0200
39 JSONDecoder::decode_json("key", key, o);
40 JSONDecoder::decode_json("val", val, o);
41 - m.insert(make_pair<K, V>(key, val));
42 + m.insert(make_pair(key, val));
46 diff -ur ceph-0.94.10/src/common/cmdparse.cc ceph-0.94.10-cxx/src/common/cmdparse.cc
47 --- ceph-0.94.10/src/common/cmdparse.cc 2017-02-21 16:13:19.000000000 +0100
48 +++ ceph-0.94.10-cxx/src/common/cmdparse.cc 2017-04-29 09:58:13.362841243 +0200
53 - lderr(cct) << oss << dendl;
54 + lderr(cct) << oss.rdbuf() << dendl;
56 free((char *)typestr);
58 diff -ur ceph-0.94.10/src/common/LogClient.h ceph-0.94.10-cxx/src/common/LogClient.h
59 --- ceph-0.94.10/src/common/LogClient.h 2017-02-21 16:13:19.000000000 +0100
60 +++ ceph-0.94.10-cxx/src/common/LogClient.h 2017-04-29 09:55:08.930587122 +0200
63 bool must_log_to_monitors() { return log_to_monitors; }
65 - typedef shared_ptr<LogChannel> Ref;
66 + typedef std::shared_ptr<LogChannel> Ref;
69 * update config values from parsed k/v map for each config option
70 diff -ur ceph-0.94.10/src/mds/CInode.cc ceph-0.94.10-cxx/src/mds/CInode.cc
71 --- ceph-0.94.10/src/mds/CInode.cc 2017-02-21 16:13:19.000000000 +0100
72 +++ ceph-0.94.10-cxx/src/mds/CInode.cc 2017-04-29 10:44:49.563391124 +0200
74 f->dump_int("read_ret_val", backtrace.ondisk_read_retval);
75 f->dump_stream("ondisk_value") << backtrace.ondisk_value;
76 f->dump_stream("memoryvalue") << backtrace.memory_value;
77 - f->dump_stream("error_str") << backtrace.error_str;
78 + f->dump_stream("error_str") << backtrace.error_str.rdbuf();
80 f->close_section(); // backtrace
81 f->open_object_section("raw_rstats");
83 f->dump_int("read_ret_val", raw_rstats.ondisk_read_retval);
84 f->dump_stream("ondisk_value") << raw_rstats.ondisk_value;
85 f->dump_stream("memory_value") << raw_rstats.memory_value;
86 - f->dump_stream("error_str") << raw_rstats.error_str;
87 + f->dump_stream("error_str") << raw_rstats.error_str.rdbuf();
89 f->close_section(); // raw_rstats
90 // dump failure return code
91 diff -ur ceph-0.94.10/src/mds/mdstypes.h ceph-0.94.10-cxx/src/mds/mdstypes.h
92 --- ceph-0.94.10/src/mds/mdstypes.h 2017-02-21 16:13:19.000000000 +0100
93 +++ ceph-0.94.10-cxx/src/mds/mdstypes.h 2017-04-29 11:15:44.723963614 +0200
95 #define MDS_TRAVERSE_DISCOVERXLOCK 3 // succeeds on (foreign?) null, xlocked dentries.
98 -BOOST_STRONG_TYPEDEF(int32_t, mds_rank_t)
99 +typedef int32_t mds_rank_t;
100 BOOST_STRONG_TYPEDEF(uint64_t, mds_gid_t)
101 extern const mds_gid_t MDS_GID_NONE;
102 extern const mds_rank_t MDS_RANK_NONE;
103 diff -ur ceph-0.94.10/src/mon/OSDMonitor.cc ceph-0.94.10-cxx/src/mon/OSDMonitor.cc
104 --- ceph-0.94.10/src/mon/OSDMonitor.cc 2017-02-21 16:13:19.000000000 +0100
105 +++ ceph-0.94.10-cxx/src/mon/OSDMonitor.cc 2017-04-29 10:17:06.705748922 +0200
106 @@ -4401,7 +4401,7 @@
108 k = erasure_code->get_data_chunk_count();
110 - ss << __func__ << " get_erasure_code failed: " << tmp;
111 + ss << __func__ << " get_erasure_code failed: " << tmp.rdbuf();
115 diff -ur ceph-0.94.10/src/msg/simple/Pipe.cc ceph-0.94.10-cxx/src/msg/simple/Pipe.cc
116 --- ceph-0.94.10/src/msg/simple/Pipe.cc 2017-02-21 16:13:19.000000000 +0100
117 +++ ceph-0.94.10-cxx/src/msg/simple/Pipe.cc 2017-04-29 10:05:09.937087135 +0200
120 void Pipe::DelayedDelivery::discard()
122 - lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout) << "DelayedDelivery::discard" << dendl;
123 + lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout).rdbuf() << "DelayedDelivery::discard" << dendl;
124 Mutex::Locker l(delay_lock);
125 while (!delay_queue.empty()) {
126 Message *m = delay_queue.front().second;
129 void Pipe::DelayedDelivery::flush()
131 - lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout) << "DelayedDelivery::flush" << dendl;
132 + lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout).rdbuf() << "DelayedDelivery::flush" << dendl;
133 Mutex::Locker l(delay_lock);
134 flush_count = delay_queue.size();
136 @@ -202,11 +202,11 @@
137 void *Pipe::DelayedDelivery::entry()
139 Mutex::Locker locker(delay_lock);
140 - lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout) << "DelayedDelivery::entry start" << dendl;
141 + lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout).rdbuf() << "DelayedDelivery::entry start" << dendl;
143 while (!stop_delayed_delivery) {
144 if (delay_queue.empty()) {
145 - lgeneric_subdout(pipe->msgr->cct, ms, 30) << pipe->_pipe_prefix(_dout) << "DelayedDelivery::entry sleeping on delay_cond because delay queue is empty" << dendl;
146 + lgeneric_subdout(pipe->msgr->cct, ms, 30) << pipe->_pipe_prefix(_dout).rdbuf() << "DelayedDelivery::entry sleeping on delay_cond because delay queue is empty" << dendl;
147 delay_cond.Wait(delay_lock);
150 @@ -216,11 +216,11 @@
152 (release > ceph_clock_now(pipe->msgr->cct) &&
153 (delay_msg_type.empty() || m->get_type_name() == delay_msg_type))) {
154 - lgeneric_subdout(pipe->msgr->cct, ms, 10) << pipe->_pipe_prefix(_dout) << "DelayedDelivery::entry sleeping on delay_cond until " << release << dendl;
155 + lgeneric_subdout(pipe->msgr->cct, ms, 10) << pipe->_pipe_prefix(_dout).rdbuf() << "DelayedDelivery::entry sleeping on delay_cond until " << release << dendl;
156 delay_cond.WaitUntil(delay_lock, release);
159 - lgeneric_subdout(pipe->msgr->cct, ms, 10) << pipe->_pipe_prefix(_dout) << "DelayedDelivery::entry dequeuing message " << m << " for delivery, past " << release << dendl;
160 + lgeneric_subdout(pipe->msgr->cct, ms, 10) << pipe->_pipe_prefix(_dout).rdbuf() << "DelayedDelivery::entry dequeuing message " << m << " for delivery, past " << release << dendl;
161 delay_queue.pop_front();
162 if (flush_count > 0) {
166 active_flush = false;
168 - lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout) << "DelayedDelivery::entry stop" << dendl;
169 + lgeneric_subdout(pipe->msgr->cct, ms, 20) << pipe->_pipe_prefix(_dout).rdbuf() << "DelayedDelivery::entry stop" << dendl;
173 diff -ur ceph-0.94.10/src/osd/PG.cc ceph-0.94.10-cxx/src/osd/PG.cc
174 --- ceph-0.94.10/src/osd/PG.cc 2017-02-21 16:13:19.000000000 +0100
175 +++ ceph-0.94.10-cxx/src/osd/PG.cc 2017-04-29 10:54:40.743267753 +0200
176 @@ -3144,7 +3144,7 @@
177 info_struct_v < 8 ? OSD::make_pg_log_oid(pg_id) : pgmeta_oid,
179 if (oss.str().length())
180 - osd->clog->error() << oss;
181 + osd->clog->error() << oss.rdbuf();
185 diff -ur ceph-0.94.10/src/rgw/rgw_cache.cc ceph-0.94.10-cxx/src/rgw/rgw_cache.cc
186 --- ceph-0.94.10/src/rgw/rgw_cache.cc 2017-02-21 16:13:19.000000000 +0100
187 +++ ceph-0.94.10-cxx/src/rgw/rgw_cache.cc 2017-04-29 11:09:17.823000713 +0200
189 for (liter = cache_entry_list.begin(); liter != cache_entry_list.end(); ++liter) {
190 ObjectCacheEntry *entry = *liter;
192 - entry->chained_entries.push_back(make_pair<RGWChainedCache *, string>(chained_entry->cache, chained_entry->key));
193 + entry->chained_entries.push_back(make_pair(chained_entry->cache, chained_entry->key));
197 diff -ur ceph-0.94.10/src/test/librbd/test_ImageWatcher.cc ceph-0.94.10-cxx/src/test/librbd/test_ImageWatcher.cc
198 --- ceph-0.94.10/src/test/librbd/test_ImageWatcher.cc 2017-02-21 16:13:19.000000000 +0100
199 +++ ceph-0.94.10-cxx/src/test/librbd/test_ImageWatcher.cc 2017-04-29 11:58:28.225636783 +0200
201 ASSERT_EQ(0, open_image(m_image_name, &ictx));
203 ASSERT_EQ(0, register_image_watch(*ictx));
204 - m_notify_acks = boost::assign::list_of(
205 - std::make_pair(NOTIFY_OP_ACQUIRED_LOCK, bufferlist()));
206 + m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
209 RWLock::WLocker l(ictx->owner_lock);
211 ASSERT_EQ(0, open_image(m_image_name, &ictx));
213 ASSERT_EQ(0, register_image_watch(*ictx));
214 - m_notify_acks = boost::assign::list_of(
215 - std::make_pair(NOTIFY_OP_ACQUIRED_LOCK, bufferlist()));
216 + m_notify_acks = {{NOTIFY_OP_ACQUIRED_LOCK, {}}};
219 RWLock::WLocker l(ictx->owner_lock);
221 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
222 "auto " + stringify(m_watch_ctx->get_handle())));
224 - m_notify_acks = boost::assign::list_of(
225 - std::make_pair(NOTIFY_OP_REQUEST_LOCK, create_response_message(0)));
226 + m_notify_acks = {{NOTIFY_OP_REQUEST_LOCK, create_response_message(0)}};
229 RWLock::WLocker l(ictx->owner_lock);
231 ASSERT_EQ(0, unlock_image());
234 - m_notify_acks = boost::assign::list_of(
235 - std::make_pair(NOTIFY_OP_RELEASED_LOCK, bufferlist()))(
236 - std::make_pair(NOTIFY_OP_ACQUIRED_LOCK, bufferlist()));
237 + m_notify_acks = {{NOTIFY_OP_RELEASED_LOCK, {}}, {NOTIFY_OP_ACQUIRED_LOCK, {}}};
242 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
243 "auto " + stringify(m_watch_ctx->get_handle())));
245 - m_notify_acks = boost::assign::list_of(
246 - std::make_pair(NOTIFY_OP_REQUEST_LOCK, bufferlist()));
247 + m_notify_acks = {{NOTIFY_OP_REQUEST_LOCK, {}}};
249 m_expected_aio_restarts = 1;
252 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
253 "auto " + stringify(m_watch_ctx->get_handle())));
255 - m_notify_acks = boost::assign::list_of(
256 - std::make_pair(NOTIFY_OP_REQUEST_LOCK, create_response_message(0)));
257 + m_notify_acks = {{NOTIFY_OP_REQUEST_LOCK, create_response_message(0)}};
259 int orig_notify_timeout = ictx->cct->_conf->client_notify_timeout;
260 ictx->cct->_conf->set_val("client_notify_timeout", "0");
262 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
263 "auto " + stringify(m_watch_ctx->get_handle())));
265 - m_notify_acks = boost::assign::list_of(
266 - std::make_pair(NOTIFY_OP_REQUEST_LOCK, create_response_message(0)));
267 + m_notify_acks = {{NOTIFY_OP_REQUEST_LOCK, create_response_message(0)}};
269 m_expected_aio_restarts = 1;
272 ASSERT_EQ(expected_notify_ops, m_notifies);
275 - m_notify_acks = boost::assign::list_of(
276 - std::make_pair(NOTIFY_OP_RELEASED_LOCK, bufferlist()));
277 + m_notify_acks = {{NOTIFY_OP_RELEASED_LOCK, {}}};
282 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
283 "auto " + stringify(m_watch_ctx->get_handle())));
285 - m_notify_acks = boost::assign::list_of(
286 - std::make_pair(NOTIFY_OP_REQUEST_LOCK, create_response_message(0)));
287 + m_notify_acks = {{NOTIFY_OP_REQUEST_LOCK, create_response_message(0)}};
289 m_expected_aio_restarts = 1;
292 ASSERT_EQ(0, lock_image(*ictx, LOCK_SHARED, "manually 1234"));
295 - m_notify_acks = boost::assign::list_of(
296 - std::make_pair(NOTIFY_OP_RELEASED_LOCK, bufferlist()));
297 + m_notify_acks = {{NOTIFY_OP_RELEASED_LOCK, {}}};
303 ASSERT_EQ(0, register_image_watch(*ictx));
305 - m_notify_acks = boost::assign::list_of(
306 - std::make_pair(NOTIFY_OP_HEADER_UPDATE, bufferlist()));
307 + m_notify_acks = {{NOTIFY_OP_HEADER_UPDATE, {}}};
308 librbd::ImageWatcher::notify_header_update(m_ioctx, ictx->header_oid);
310 ASSERT_TRUE(wait_for_notifies(*ictx));
312 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
313 "auto " + stringify(m_watch_ctx->get_handle())));
315 - m_notify_acks = boost::assign::list_of(
316 - std::make_pair(NOTIFY_OP_FLATTEN, create_response_message(0)));
317 + m_notify_acks = {{NOTIFY_OP_FLATTEN, create_response_message(0)}};
319 ProgressContext progress_context;
320 FlattenTask flatten_task(ictx, &progress_context);
322 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
323 "auto " + stringify(m_watch_ctx->get_handle())));
325 - m_notify_acks = boost::assign::list_of(
326 - std::make_pair(NOTIFY_OP_RESIZE, create_response_message(0)));
327 + m_notify_acks = {{NOTIFY_OP_RESIZE, create_response_message(0)}};
329 ProgressContext progress_context;
330 ResizeTask resize_task(ictx, &progress_context);
332 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
333 "auto " + stringify(m_watch_ctx->get_handle())));
335 - m_notify_acks = boost::assign::list_of(
336 - std::make_pair(NOTIFY_OP_SNAP_CREATE, create_response_message(0)));
337 + m_notify_acks = {{NOTIFY_OP_SNAP_CREATE, create_response_message(0)}};
339 RWLock::RLocker l(ictx->owner_lock);
340 ASSERT_EQ(0, ictx->image_watcher->notify_snap_create("snap"));
342 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
343 "auto " + stringify(m_watch_ctx->get_handle())));
345 - m_notify_acks = boost::assign::list_of(
346 - std::make_pair(NOTIFY_OP_SNAP_CREATE, create_response_message(-EEXIST)));
347 + m_notify_acks = {{NOTIFY_OP_SNAP_CREATE, create_response_message(-EEXIST)}};
349 RWLock::RLocker l(ictx->owner_lock);
350 ASSERT_EQ(-EEXIST, ictx->image_watcher->notify_snap_create("snap"));
352 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
353 "auto " + stringify(m_watch_ctx->get_handle())));
355 - m_notify_acks = boost::assign::list_of(
356 - std::make_pair(NOTIFY_OP_FLATTEN, bufferlist()));
357 + m_notify_acks = {{NOTIFY_OP_FLATTEN, {}}};
359 ProgressContext progress_context;
360 FlattenTask flatten_task(ictx, &progress_context);
362 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
363 "auto " + stringify(m_watch_ctx->get_handle())));
365 - m_notify_acks = boost::assign::list_of(
366 - std::make_pair(NOTIFY_OP_FLATTEN, create_response_message(-EIO)));
367 + m_notify_acks = {{NOTIFY_OP_FLATTEN, create_response_message(-EIO)}};
369 ProgressContext progress_context;
370 FlattenTask flatten_task(ictx, &progress_context);
372 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
373 "auto " + stringify(m_watch_ctx->get_handle())));
375 - m_notify_acks = boost::assign::list_of(
376 - std::make_pair(NOTIFY_OP_FLATTEN, create_response_message(0)));
377 + m_notify_acks = {{NOTIFY_OP_FLATTEN, create_response_message(0)}};
379 ProgressContext progress_context;
380 FlattenTask flatten_task(ictx, &progress_context);
382 ASSERT_EQ(0, lock_image(*ictx, LOCK_EXCLUSIVE,
383 "auto " + stringify(m_watch_ctx->get_handle())));
385 - m_notify_acks = boost::assign::list_of(
386 - std::make_pair(NOTIFY_OP_FLATTEN, create_response_message(0)));
387 + m_notify_acks = {{NOTIFY_OP_FLATTEN, create_response_message(0)}};
389 ProgressContext progress_context;
390 FlattenTask flatten_task(ictx, &progress_context);