The proc_replica_info() method will do the same job in a
smarter way, so the succeeding call to update_heartbeat_peers()
is unnecessary and cost expensive.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Use cmake's FindOpenSSL. Actually use the library definitions that
come out of it. Also use the include path. If SSL is disabled,
then build without any of this. The result will be a version
of civetweb that includes openssl support using dlopen() - ie,
what we used to do. This is probably a bit silly, and I hope
nobody actually expects to use it that way, but it's mostly harmless.
Signed-off-by: Marcus Watts <mwatts@redhat.com>
Use find_package to enforce the dependency up front (we should be
using this pattern throughout top-level CMakeLists.txt).
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Clean up some code in the new multi-fs handling. Make its output
more precise and add some debug/repair config options.
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Conflicts:
src/mds/FSMap.cc
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Be more careful about directory fragmentation and scrubbing
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
The global image id is needed to crosslink images when an image is
replicated between multiple clusters.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
We already have a count function from RGWUserBuckets class which gives
the total size of the map, use that instead of getting the map and doing
a count.
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Though is_omap don't make sure object has omap header or k/v now, if
object isn't has FLAG_OMAP, it must don't have omap header or k/v.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
For set omap heaader or k/v, it set FLAG_OMAP. When remove header
or k/v, it don't remove FLAG_OMAP because it don't know object whether
have omap header or other k/vs.
Though object has FLAG_OMAP dont mean now it has omap header or k/v, it
better check FLAG_OMAP than pool whether support omap operations for omap reads.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
There are newly added branches for proc_master_log() method will
potentially dirty info but without setting dirty_info flag.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Default mon_num=3, if we change this and using -k to create a new
cluster. It don't work. So we must record the old mon_num.
The same for osd_num/mds_num/rgw_num.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
We need to shorten the virtualenv path for non-Jenkins builds
too; gitbuilders were also overflowing the interpreter path limit
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Debian Jessie (at least) now has the virtualenv command in
package 'virtualenv', which depends on python3-virtualenv, and
that's how you get the virtualenv command there. Earlier
Debian-based releases still use python-virtualenv. Jessie's
virtualenv command still creates a python2 venv by default.
This will require a followup fix for install-deps.sh
to handle the | correctly, because currently it sends
the string to apt-get, which treats it as a regular expression
alternation of the two package names, so will try to install both.
The problem occurs when packages are installed without Recommended
packages (because jessie's virtualenv package currently Recommends
python-virtualenv); this is the case under pbuilder, and also using
'mk-build-deps --install', and I suspect under other automated
package-building tools.
Note that Build-Requires processing is not specified to
perform the searches in left-to-right order, so even this is
a tenuous workaround. We probably need distro-specific
debian/ directories.
Signed-off-by: Dan Mick <dan.mick@redhat.com>
