Ceph » rgw

Getting below compilation errors while backporting this PR, so need to backport 2 more commits to get this PR into luminous:

[ 97%] Building CXX object src/rgw/CMakeFiles/rgw_a.dir/rgw_rest_log.cc.o
[ 97%] Building CXX object src/rgw/CMakeFiles/rgw_a.dir/rgw_rest_metadata.cc.o
In file included from /home/pdvian/backport/ceph1_lum/src/rgw/rgw_realm_watcher.h:8:0,
from /home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc:72:
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc: In constructor ‘RGWPutObj_Buffer::RGWPutObj_Buffer(RGWPutObjDataProcessor*, unsigned int)’:
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc:7326:12: error: ‘isp2’ was not declared in this scope
assert(isp2(buffer_size)); // must be power of 2
^
/home/pdvian/backport/ceph1_lum/src/include/assert.h:125:5: note: in definition of macro ‘assert’
((expr) \
^_{~~
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc:7326:12: note: suggested alternative: ‘dup2’
assert(isp2(buffer_size)); // must be power of 2
^
/home/pdvian/backport/ceph1_lum/src/include/assert.h:125:5: note: in definition of macro ‘assert’
((expr) \
^}~~
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc: In member function ‘virtual int RGWPutObj_Buffer::handle_data(ceph::bufferlist&, off_t, void**, rgw_raw_obj*, bool*)’:
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc:7342:24: error: ‘p2align’ was not declared in this scope
const auto count = p2align(buffer.length(), buffer_size);
^_~~~~
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc:7342:24: note: suggested alternative: ‘memalign’
const auto count = p2align(buffer.length(), buffer_size);
^_~~~~
memalign
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc: In member function ‘virtual int RGWRadosPutObj::flush()’:
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc:7476:46: error: ‘ofs’ was not declared in this scope
return put_data_and_throttle(filter, bl, ofs, false);
^_{~
/home/pdvian/backport/ceph1_lum/src/rgw/rgw_rados.cc:7476:46: note: suggested alternative: ‘ffs’
return put_data_and_throttle(filter, bl, ofs, false);
^}~
ffs
make³: * [src/rgw/CMakeFiles/rgw_a.dir/build.make:1339: src/rgw/CMakeFiles/rgw_a.dir/rgw_rados.cc.o] Error 1
make³: Waiting for unfinished jobs....
make²: [CMakeFiles/Makefile2:23127: src/rgw/CMakeFiles/rgw_a.dir/all] Error 2
make¹: [CMakeFiles/Makefile2:234: CMakeFiles/tests.dir/rule] Error 2
make: ** [Makefile:175: tests] Error 2

Need to include below commits to backport this PR:

$ git log -n 2 c06b97b3
commit c06b97b3d7e36b5b3be38f1ffa121611bea61a52
Author: Adam C. Emerson <aemerson@redhat.com>
Date: Wed Jan 10 17:06:53 2018 -0500

include: Add templates along side macros in intarith

The macros can be removed later.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

commit 4da29a07cfc4c7c3e6fb499f4f7ddac307292ca0

$ git log -n1 b2143cded
commit b2143cded0e971361cdb089db19a6f69ce5b74dd
Author: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri Nov 3 15:57:56 2017 -0700

rgw: rest_client: work towards throttling of http read requests

Adjust the interfaces to provide the ability for the read callback
    to pause the reads. While doing that, define a new class interface
    for this instead of RGWGetDataCB. This had a butterfly effect that
    required modifications to the obj read filters, but the end result
    is a bit cleaner.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>