Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: rgw/rgw_op: Remove get_val from hotpath via legacy options #30141

Merged
merged 1 commit into from Oct 8, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Sep 4, 2019

@smithfarm smithfarm added this to the mimic milestone Sep 4, 2019
@smithfarm smithfarm added the rgw label Sep 4, 2019
@smithfarm smithfarm requested review from cbodley and mattbenjamin Sep 4, 2019
Copy link
Contributor

mattbenjamin left a comment

looks good

@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 7, 2019

Build failure:

In file included from /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/dout.h:22:0,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/common/debug.h:18,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/compressor/Compressor.cc:24:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/legacy_config_opts.h:1253:8: error: 'rgw_max_attr_name_len' has not been declared
 OPTION(rgw_max_attr_name_len, OPT_SIZE)
        ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:17: note: in definition of macro 'OPTION'
     OPTION_##ty(name)
                 ^~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:21: error: ISO C++ forbids declaration of 'OPTION_OPT_SIZE' with no type [-fpermissive]
     OPTION_##ty(name)
                     ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/legacy_config_opts.h:1253:1: note: in expansion of macro 'OPTION'
 OPTION(rgw_max_attr_name_len, OPT_SIZE)
 ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:21: error: expected ';' at end of member declaration
     OPTION_##ty(name)
                     ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/legacy_config_opts.h:1253:1: note: in expansion of macro 'OPTION'
 OPTION(rgw_max_attr_name_len, OPT_SIZE)
 ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/legacy_config_opts.h:1254:8: error: 'rgw_max_attr_size' has not been declared
 OPTION(rgw_max_attr_size, OPT_SIZE)
        ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:17: note: in definition of macro 'OPTION'
     OPTION_##ty(name)
                 ^~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:21: error: ISO C++ forbids declaration of 'OPTION_OPT_SIZE' with no type [-fpermissive]
     OPTION_##ty(name)
                     ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/legacy_config_opts.h:1254:1: note: in expansion of macro 'OPTION'
 OPTION(rgw_max_attr_size, OPT_SIZE)
 ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:21: error: expected ';' at end of member declaration
     OPTION_##ty(name)
                     ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/legacy_config_opts.h:1254:1: note: in expansion of macro 'OPTION'
 OPTION(rgw_max_attr_size, OPT_SIZE)
 ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:5: error: 'int md_config_t::OPTION_OPT_SIZE(int)' cannot be overloaded
     OPTION_##ty(name)
     ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:5: note: in definition of macro 'OPTION'
     OPTION_##ty(name)
     ^~~~~~~
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:5: error: with 'int md_config_t::OPTION_OPT_SIZE(int)'
     OPTION_##ty(name)
     ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/common/config.h:362:5: note: in definition of macro 'OPTION'
     OPTION_##ty(name)
     ^~~~~~~
src/compressor/CMakeFiles/compressor_objs.dir/build.make:62: recipe for target 'src/compressor/CMakeFiles/compressor_objs.dir/Compressor.cc.o' failed
make[3]: *** [src/compressor/CMakeFiles/compressor_objs.dir/Compressor.cc.o] Error 1
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Sep 8, 2019

@cbodley Could you look at the build failure? I'm stumped.

@@ -1250,6 +1250,10 @@ OPTION(rados_tracing, OPT_BOOL) // true if LTTng-UST tracepoints should be enabl
OPTION(nss_db_path, OPT_STR) // path to nss db


OPTION(rgw_max_attr_name_len, OPT_SIZE)
OPTION(rgw_max_attr_size, OPT_SIZE)

This comment has been minimized.

Copy link
@cbodley

cbodley Sep 13, 2019

Contributor

OPT_SIZE doesn't seem to exist in mimic. i think these can be OPT_INT instead

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit b7608ec)

Conflicts:
        src/common/legacy_config_opts.h
- OPT_SIZE doesn't seem to exist in mimic. use OPT_INT instead
	src/rgw/rgw_op.h
- where master has cct->_conf.get_val, in mimic we say "cct->_conf->get_val"
@smithfarm smithfarm force-pushed the smithfarm:wip-41625-mimic branch from 193275a to 73f9642 Sep 13, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 1, 2019

@cbodley OK, please take another look? I made the change you suggested, and that seems to have fixed the build.

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 3, 2019

@yuriw yuriw merged commit 7d48cd0 into ceph:mimic Oct 8, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-41625-mimic branch Oct 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.