]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
J. Eric Ivancich [Thu, 29 Aug 2019 14:41:53 +0000 (10:41 -0400)]
rgw: make rollback refcount tag match
When the refcount does a "get", the tag ends with a null character,
but during a rollback, when the tag is "put" it does not end with a
null character, so the same tag is not being manipulated and the
refcounts are therefore off, preventing future deletion of an rgw
object. This adds the null character to the "put" operation.
This change was originally submitted by lltlo <
120680451 @qq.com> but
wasn't signed-off.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit
a0fee94982d89f0210e1c526605831105cd90ef4 )
Conflicts:
src/rgw/rgw_rados.cc
J. Eric Ivancich [Thu, 29 Aug 2019 14:36:17 +0000 (10:36 -0400)]
rgw: make sure object's idtag is updated when available
This change was originally submitted by lltlo <
120680451 @qq.com> but
had some formatting issues and wasn't signed-off.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit
7d32b082f826181b605ae02ebc914fba9ac0d449 )
Conflicts:
src/rgw/rgw_rados.cc
Yuri Weinstein [Fri, 11 Oct 2019 20:23:59 +0000 (13:23 -0700)]
Merge pull request #29258 from smithfarm/wip-39741-mimic
mimic: rgw: swift object expiry fails when a bucket reshards
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:23:12 +0000 (13:23 -0700)]
Merge pull request #29483 from pdvian/wip-40761-mimic
mimic: rgw: Save an unnecessary copy of RGWEnv
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:22:43 +0000 (13:22 -0700)]
Merge pull request #29500 from pdvian/wip-40847-mimic
mimic: rgw: Don't crash on copy when metadata directive not supplied
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:22:21 +0000 (13:22 -0700)]
Merge pull request #30073 from smithfarm/wip-40517-mimic
mimic: rgw: perfcounters: add gc retire counter
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:21:50 +0000 (13:21 -0700)]
Merge pull request #30077 from smithfarm/wip-40599-mimic
mimic: rgw_file: fix readdir eof() calc--caller stop implies !eof and introduce fast S3 Unix stats (immutable)
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:19:36 +0000 (13:19 -0700)]
Merge pull request #29276 from smithfarm/wip-40215-mimic
mimic: rgw_file: fix invalidation of top-level directories
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:18:44 +0000 (13:18 -0700)]
Merge pull request #29984 from pdvian/wip-41110-mimic
mimic: rgw: fix drain handles error when deleting bucket with bypass-gc option
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:18:15 +0000 (13:18 -0700)]
Merge pull request #30074 from smithfarm/wip-40539-mimic
mimic: cls/rgw: keep issuing bilog trim ops after reset
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:15:56 +0000 (13:15 -0700)]
Merge pull request #30105 from smithfarm/wip-41120-mimic
mimic: rgw: permit rgw-admin to populate user info by access-key
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 11 Oct 2019 20:15:29 +0000 (13:15 -0700)]
Merge pull request #30130 from smithfarm/wip-40629-mimic
mimic: rgw: data/bilogs are trimmed when no peers are reading them
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:23:19 +0000 (13:23 -0700)]
Merge pull request #30233 from smithfarm/wip-41129-mimic
mimic: qa: use hard_reset to reboot kclient
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:22:54 +0000 (13:22 -0700)]
Merge pull request #30234 from smithfarm/wip-40444-mimic
mimic: mds: cleanup unneeded client_snap_caps when splitting snap inode
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:22:26 +0000 (13:22 -0700)]
Merge pull request #30235 from smithfarm/wip-40844-mimic
mimic: mon/MDSMonitor: use stringstream instead of dout for mds repaired
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:22:01 +0000 (13:22 -0700)]
Merge pull request #30236 from smithfarm/wip-40853-mimic
mimic: cephfs: test_volume_client: fix test_put_object_versioned()
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:21:26 +0000 (13:21 -0700)]
Merge pull request #30238 from smithfarm/wip-40896-mimic
mimic: cephfs: ceph_volume_client: convert string to bytes object
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:20:55 +0000 (13:20 -0700)]
Merge pull request #30239 from smithfarm/wip-40899-mimic
mimic: mds: evict an unresponsive client only when another client wants its caps
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:19:16 +0000 (13:19 -0700)]
Merge pull request #30240 from smithfarm/wip-41466-mimic
mimic: cephfs: mount.ceph: properly handle -o strictatime
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:18:29 +0000 (13:18 -0700)]
Merge pull request #30241 from smithfarm/wip-41487-mimic
mimic: cephfs: client: return -EIO when sync file which unsafe reqs have been dropped
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:18:06 +0000 (13:18 -0700)]
Merge pull request #30417 from pdvian/wip-41852-mimic
mimic: mds: make MDSIOContextBase delete itself when shutting down
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Thu, 10 Oct 2019 20:17:41 +0000 (13:17 -0700)]
Merge pull request #30443 from pdvian/wip-41856-mimic
mimic: cephfs: client: nfs-ganesha with cephfs client, removing dir reports not empty
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:12:11 +0000 (12:12 -0700)]
Merge pull request #29609 from jtlayton/wip-40162-mimic
mimic: cephfs: client: fix bad error handling in _lookup_parent
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:11:38 +0000 (12:11 -0700)]
Merge pull request #29751 from pdvian/wip-41088-mimic
mimic: qa: sleep briefly after resetting kclient
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:11:01 +0000 (12:11 -0700)]
Merge pull request #29812 from pdvian/wip-41094-mimic
mimic: qa: ignore expected MDS_CLIENT_LATE_RELEASE warning
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:10:40 +0000 (12:10 -0700)]
Merge pull request #29833 from pdvian/wip-41097-mimic
mimic: cephfs: avoid map been inserted by mistake
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:10:18 +0000 (12:10 -0700)]
Merge pull request #29915 from pdvian/wip-41100-mimic
mimic: cephfs: fix a memory leak
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:09:57 +0000 (12:09 -0700)]
Merge pull request #29940 from pdvian/wip-41108-mimic
mimic: mds: delay exporting directory whose pin value exceeds max rank id
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:09:32 +0000 (12:09 -0700)]
Merge pull request #30108 from smithfarm/wip-40442-mimic
mimic: cephfs: client: set snapdir's link count to 1
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Wed, 9 Oct 2019 19:08:47 +0000 (12:08 -0700)]
Merge pull request #30228 from smithfarm/wip-40841-mimic
mimic: cephfs: client: support the fallocate() when fuse version >= 2.9
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Jan Fajerski [Wed, 9 Oct 2019 11:13:56 +0000 (13:13 +0200)]
Merge pull request #30678 from sobelek/wip-42048-mimic
mimic: ceph-volume: fix warnings raised by pytest
Yuri Weinstein [Tue, 8 Oct 2019 20:09:49 +0000 (13:09 -0700)]
Merge pull request #30135 from smithfarm/wip-41126-mimic
mimic: rgw: swift: refrain from corrupting static large objects when using nginx as a GET cache
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:05:57 +0000 (13:05 -0700)]
Merge pull request #30134 from smithfarm/wip-41103-mimic
mimic: rgw: mitigate bucket list with max-entries excessively high
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:04:54 +0000 (13:04 -0700)]
Merge pull request #30140 from smithfarm/wip-41131-mimic
mimic: rgw: Fix bucket versioning vs. swift metadata bug.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:04:29 +0000 (13:04 -0700)]
Merge pull request #30141 from smithfarm/wip-41625-mimic
mimic: rgw/rgw_op: Remove get_val from hotpath via legacy options
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:03:59 +0000 (13:03 -0700)]
Merge pull request #30154 from smithfarm/wip-41265-mimic
mimic: rgw: don't throw when accept errors are happening on frontend
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:03:32 +0000 (13:03 -0700)]
Merge pull request #30156 from smithfarm/wip-41270-mimic
mimic: rgw: Fix rgw decompression log-print
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:03:06 +0000 (13:03 -0700)]
Merge pull request #30157 from smithfarm/wip-41342-mimic
mimic: rgw_file: readdir: do not construct markers w/leading '/'
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:02:38 +0000 (13:02 -0700)]
Merge pull request #30159 from pdvian/wip-41628-mimic
mimic: rgw: RGWCoroutine::call(nullptr) sets retcode=0
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:01:56 +0000 (13:01 -0700)]
Merge pull request #30165 from smithfarm/wip-41381-mimic
mimic: rgw: housekeeping of reset stats operation in radosgw-admin and cls back-end
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:01:22 +0000 (13:01 -0700)]
Merge pull request #30166 from smithfarm/wip-41478-mimic
mimic: rgw: make dns hostnames matching case insensitive
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 20:00:53 +0000 (13:00 -0700)]
Merge pull request #30167 from smithfarm/wip-41483-mimic
mimic: rgw: fix potential realm watch lost
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:59:11 +0000 (12:59 -0700)]
Merge pull request #30168 from smithfarm/wip-41484-mimic
mimic: rgw: fix list bucket with delimiter wrongly skip some special keys
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:58:50 +0000 (12:58 -0700)]
Merge pull request #30510 from pdvian/wip-41897-mimic
mimic: rgw: fix data sync start delay if remote haven't init data_log
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:56:14 +0000 (12:56 -0700)]
Merge pull request #30170 from smithfarm/wip-41494-mimic
mimic: radosgw-admin: bucket sync status not 'caught up' during full sync
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:55:51 +0000 (12:55 -0700)]
Merge pull request #30171 from smithfarm/wip-41578-mimic
mimic: rgw: fix CreateBucket with BucketLocation parameter failed under default zonegroup
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:55:29 +0000 (12:55 -0700)]
Merge pull request #30172 from smithfarm/wip-41632-mimic
mimic: rgw: fixed "unrecognized arg" error when using "radosgw-admin zone rm".
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:55:07 +0000 (12:55 -0700)]
Merge pull request #30173 from smithfarm/wip-41638-mimic
mimic: rgw: gc remove tag after all sub io finish
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:54:41 +0000 (12:54 -0700)]
Merge pull request #30253 from smithfarm/wip-41708-mimic
mimic: rgw: fix cls_bucket_list_unordered() partial results
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:53:54 +0000 (12:53 -0700)]
Merge pull request #30340 from smithfarm/wip-39014-mimic
mimic: rgw admin: disable stale instance delete in a multiste env
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:53:32 +0000 (12:53 -0700)]
Merge pull request #30450 from smithfarm/wip-41847-mimic
mimic: rgw: increase beast parse buffer size to 64k
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:52:53 +0000 (12:52 -0700)]
Merge pull request #30652 from pdvian/wip-41971-mimic
mimic: rgw: ldap auth: S3 auth failure should return InvalidAccessKeyId
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 19:52:04 +0000 (12:52 -0700)]
Merge pull request #30660 from smithfarm/wip-40626-mimic
mimic: rgw_file: advance_mtime() should consider namespace expiration
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:23:24 +0000 (08:23 -0700)]
Merge pull request #28125 from dillaman/wip-39429-mimic
mimic: rbd: librbd: async open/close should free ImageCtx before issuing callback
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:22:54 +0000 (08:22 -0700)]
Merge pull request #29294 from dillaman/wip-40234-mimic
mimic: rbd/action: fix error getting positional argument
Yuri Weinstein [Tue, 8 Oct 2019 15:22:20 +0000 (08:22 -0700)]
Merge pull request #29565 from pdvian/wip-40881-mimic
mimic: rbd: Reduce log level for cls/journal and cls/rbd expected errors
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:21:55 +0000 (08:21 -0700)]
Merge pull request #29872 from trociny/wip-41284-mimic
mimic: rbd-mirror: don't overwrite status error returned by replay
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:21:08 +0000 (08:21 -0700)]
Merge pull request #29873 from trociny/wip-41423-mimic
mimic: qa/workunits/rbd: stress test `rbd mirror pool status --verbose`
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:20:36 +0000 (08:20 -0700)]
Merge pull request #30117 from smithfarm/wip-41438-mimic
mimic: rbd-mirror: ignore errors relating to parsing the cluster config file
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:20:04 +0000 (08:20 -0700)]
Merge pull request #30121 from pdvian/wip-41622-mimic
mimic: tools/rbd-ggate: close log before running postfork
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:19:37 +0000 (08:19 -0700)]
Merge pull request #30176 from smithfarm/wip-39316-mimic
mimic: krbd: fix rbd map hang due to udev return subsystem unordered
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:18:53 +0000 (08:18 -0700)]
Merge pull request #30177 from smithfarm/wip-40380-mimic
mimic: rbd: librbd: avoid dereferencing an empty container during deep-copy
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:18:11 +0000 (08:18 -0700)]
Merge pull request #30178 from smithfarm/wip-40500-mimic
mimic: rbd: use the ordered throttle for the export action
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:16:57 +0000 (08:16 -0700)]
Merge pull request #30424 from smithfarm/wip-41543-mimic
mimic: test/librbd: set nbd timeout due to newer kernels defaulting it on
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 8 Oct 2019 15:16:18 +0000 (08:16 -0700)]
Merge pull request #30569 from pdvian/wip-41955-mimic
mimic: rbd/tests: avoid hexdump skip and length options in krbd test
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 7 Oct 2019 19:46:22 +0000 (12:46 -0700)]
Merge pull request #30718 from smithfarm/wip-epel-release-snafu-mimic
mimic: build/ops: backport miscellaneous install-deps.sh and ceph.spec.in fixes from master
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 7 Oct 2019 19:31:15 +0000 (12:31 -0700)]
Merge pull request #29241 from smithfarm/wip-38206-mimic
mimic: core: osds allows to partially start more than N+2
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Patrick Donnelly [Mon, 7 Oct 2019 19:30:10 +0000 (12:30 -0700)]
Merge PR #29225 into mimic
* refs/pull/29225/head:
common/secret.c: fix key parsing when doing a remount
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Jason Dillaman [Wed, 19 Jun 2019 15:09:54 +0000 (11:09 -0400)]
rbd: use the ordered throttle for the export action
This allows exports to STDOUT to use multiple concurrent operations
and also fixes a potential race condition with concurrent callbacks
and file seeking.
Fixes: http://tracker.ceph.com/issues/40435
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
751bf6957020ad02b3a29b005b9792b9c6547f96 )
Conflicts:
src/tools/rbd/action/Export.cc
- mimic has g_conf->get_val and int64_t "rbd_concurrent_management_ops"
Yuri Weinstein [Mon, 7 Oct 2019 19:26:08 +0000 (12:26 -0700)]
Merge pull request #30291 from tchaikov/wip-mimic-41447
mimic: osd/PrimaryLogPG: Avoid accessing destroyed references in finish_degr…
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Mon, 7 Oct 2019 19:25:38 +0000 (12:25 -0700)]
Merge pull request #30447 from tchaikov/wip-mimic-37866
mimic: mgr/localpool: pg_num is an int arg to 'osd pool create'
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 7 Oct 2019 19:25:03 +0000 (12:25 -0700)]
Merge pull request #30481 from pdvian/wip-41863-mimic
mimic: mon: ensure prepare_failure() marks no_reply on op
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 7 Oct 2019 19:24:03 +0000 (12:24 -0700)]
Merge pull request #30485 from sobelek/wip-41922-mimic
mimic: mon: show pool id in pool ls command
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 7 Oct 2019 19:22:14 +0000 (12:22 -0700)]
Merge pull request #30543 from smithfarm/wip-39317-mimic
mimic: mgr/dashboard: RGW proxy can't handle self-signed SSL certificates
Reviewed-by: Volker Theile <vtheile@suse.com>
Yuri Weinstein [Mon, 7 Oct 2019 19:21:29 +0000 (12:21 -0700)]
Merge pull request #30275 from pdvian/wip-41704-mimic
mimic: osd/PrimaryLogPG: update oi.size on write op implicitly truncating ob…
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jeff Layton [Thu, 26 Sep 2019 11:50:28 +0000 (07:50 -0400)]
ceph.spec.in: fix Cython package dependency for Fedora
Fedora distros do not have python3?-Cython packages, but they do have
python3-Cython ones. Fix the BuildRequires so that we only use the
python3_version_nodots based version string for RHEL.
Fixes: https://tracker.ceph.com/issues/42032
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
40c5a18f81c67c96f6a35e592ac3141b87c19701 )
Kefu Chai [Fri, 30 Aug 2019 11:49:28 +0000 (19:49 +0800)]
ceph.spec.in: s/pkgversion/version_nodots/
`python3_pkgversion` is now defined as 3, while we don't have packages
like python3-Cython yet in EPEL7. but we do have `python36-Cython`. so
let's use `python3_version_nodots` instead.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
6d2f66846d1b84595cfdf8ac13a7ed4e1ae608ce )
Nathan Cutler [Tue, 15 Jan 2019 14:34:42 +0000 (15:34 +0100)]
rpm: make Python build deps somewhat less confusing
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
0b79741a770acb5cee6de2dd88022cd2c5d15ef5 )
Conflicts:
ceph.spec.in
Brad Hubbard [Mon, 4 Mar 2019 02:38:25 +0000 (12:38 +1000)]
rpm: Install python2-Cython in python2 environment
do_cmake.sh tests for Cython module version in python2
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
6de7111e735683f2c73d4c013d9611fc02b68985 )
Conflicts:
ceph.spec.in
Kefu Chai [Fri, 27 Sep 2019 02:26:54 +0000 (10:26 +0800)]
install-deps: do not install if rpm already installed
there is chance that the system already have epel-release-latest-7.noarch.rpm
installed, in that case, install-deps.sh should not fail.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
45a4173bcfe15a9bf56f6aeb6e6c35386a00d1c5 )
Nathan Cutler [Tue, 24 Sep 2019 19:48:27 +0000 (21:48 +0200)]
install-deps.sh: add EPEL repo for non-x86_64 archs as well
Fixes: https://tracker.ceph.com/issues/42023
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
49d740118f9a0ee6b6bb82954630c654946f1751 )
Kefu Chai [Wed, 13 Feb 2019 11:56:00 +0000 (19:56 +0800)]
install-deps.sh: extract munge_debian_control()
this function will uncomment necessary dependencies on demand.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
4fd179654e3c37c837899372859959283479cee6 )
Conflicts:
install-deps.sh
Kefu Chai [Sat, 26 Jan 2019 17:20:53 +0000 (01:20 +0800)]
install-deps.sh: use latest setuptools
this change reverts "install-deps.sh: workaround setuptools' dependency on six"
This reverts commit
30ce5e55460e333e1240704112a16fae68b3325f .
tl;dr: this change addresses the failures of "make check" runs on arm64
builders when they try to build `mgr-dashboard-test-venv` target.
long story: without this change, we will fail to pull in
setuptools >= 36, and as a result pip will fail to import
`setuptools.build_meta` in `pip/_vendor/pep517/_in_process.py`. and will
a `BackendUnavailable` exception thrown by `_call_hook()` in
`pip/_vendor/pep517/wrappers.py`. since the issue addressed by
30ce5e55
has been addressed since setuptools >= 36.0.1, we should be safe to
upgrade to the latest setuptools now.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
8b55b47cc75e43ef683cd230f792cd92f1c46fa7 )
Kefu Chai [Wed, 19 Dec 2018 08:37:55 +0000 (16:37 +0800)]
install-deps.sh: skip unavailable repos
as centos-sclo-rh-source leads us to 404 at this moment. and we are not
using the source repo for building ceph. so we can just skip any
unavailable repo.
Fixes: http://tracker.ceph.com/issues/37707
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
aa2b9e9a643441d9a2891e17920677a7725754c4 )
Changcheng Liu [Fri, 26 Oct 2018 06:32:09 +0000 (14:32 +0800)]
install-deps.sh: correct gcc version info as major.minor.patch
On ubuntu 18.04, "gcc -dumpversion" output "7", it result in
that below check will return false:
dpkg --compare-versions 7 ge 7.0
Then, this script will install other gcc.
Actully, the full gcc version "gcc -dumpfullversion" output is
"7.3.0", than below check will turn true:
dpkg --compare-version 7.3.0 ge 7.0
So, there's no need to install other gcc.
In case of hitting error on ubuntu16.04, use below parameter:
gcc -dumpfullversion -dumpversion
Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
(cherry picked from commit
ab7344e61755b357c558aef3630e1479d5dcc7b3 )
Kefu Chai [Sat, 10 Nov 2018 21:33:43 +0000 (13:33 -0800)]
install-deps: install setuptools before upgrading virtualenv
this should address the failures when running install-deps.sh, like
Downloading/unpacking virtualenv
Running setup.py egg_info for package virtualenv
/usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown
distribution option: 'python_requires'
warnings.warn(msg)
error in virtualenv setup command: 'extras_require' must be a
dictionary whose values are strings or lists of strings containing valid
project/version requirement specifiers.
Complete output from command python setup.py egg_info:
/usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown
distribution option: 'python_requires'
warnings.warn(msg)
error in virtualenv setup command: 'extras_require' must be a dictionary
whose values are strings or lists of strings containing valid
project/version requirement specifiers.
this only happens on very old virtualenv shipped with RHEL7.4
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
95386752ab2635f56e1d38b50de7144e2135b323 )
Sebastian Wagner [Wed, 10 Oct 2018 12:21:04 +0000 (14:21 +0200)]
install-deps.sh: dashboard frontend needs git
Running `npm install` for the dashboard pulls dependenies with git.
Under some setups, git was not installed when building the frontend.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
d8de543b7e8f815f46e6a967fb5df4620f1cfbc4 )
Kefu Chai [Fri, 28 Sep 2018 03:45:03 +0000 (11:45 +0800)]
install-deps: do not specify unknown options
per apt.conf(5), and
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550564,
"Acquire::Translation" is not documented and will be deprecated. it
would be better to use "Acquire::Languages" solely. and it's consistent
with https://github.com/ceph/ceph-build/pull/1137 .
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
3911a7c7d068fde7c1ea7b1a2af0063e1249d697 )
Nathan Cutler [Wed, 1 Aug 2018 10:33:58 +0000 (12:33 +0200)]
build/ops: unify command substitution in install-deps.sh
The $() form is preferable to `` because folks (like me) might be using
` as a keyboard shortcut to GNU Screen, causing havoc to ensue whenever
copy-pasting the ` character.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
e0042dd617269934bf51efee5bab7e4485875576 )
Kefu Chai [Tue, 10 Jul 2018 12:23:48 +0000 (20:23 +0800)]
install-deps.sh: import ubuntu-toolchain-r's key without keyserver
we are running into following error recently
gpg: requesting key
BA9EF27F from hkp server keyserver.ubuntu.com
gpgkeys: key
1E9377A2BA9EF27F can't be retrieved
gpg: no valid OpenPGP data found.
gpg: Total number processed: 0
gpg: keyserver communications error: keyserver helper general error
gpg: keyserver communications error: unknown pubkey algorithm
gpg: keyserver receive failed: unknown pubkey algorithm
so use the local copy of the pubkey instead
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
b94e3790c88d599821b71bc76b20755c9580c081 )
Yunchuan Wen [Sun, 24 Jun 2018 01:48:50 +0000 (09:48 +0800)]
install-deps: check the exit status for the $builddepcmd
in some case, the $builddepcmd will failed without any "error:" output.
so we should check the exit status to handle it.
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
(cherry picked from commit
46e33d15a4132772a6bd11cd49f4181081bcdd55 )
Tomasz Setkowski [Sat, 14 Apr 2018 15:23:58 +0000 (15:23 +0000)]
install-deps: fix installing gcc on ubuntu when no old compiler
Signed-off-by: Tomasz Setkowski <tom@ai-traders.com>
(cherry picked from commit
0d8d0cf6f7594f4f97677a2069998331998bdfa9 )
Yunchuan Wen [Thu, 7 Jun 2018 07:51:31 +0000 (15:51 +0800)]
install-deps.sh: support install gcc7 in xenial aarch64
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
(cherry picked from commit
f92f256f4503d19f41b7c300a4df46b189e81a9b )
Kefu Chai [Wed, 16 May 2018 11:41:52 +0000 (19:41 +0800)]
install-deps: nuke wheelhouse if it's stale
otherwise, if we update *requirements.txt, and the wheelhouse fails to
offer the newly added dependency, the setup-virtualenv.sh will fail the
build.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
ed0ca70707439f44779ca7093461182d73db1a77 )
Zack Cerza [Fri, 1 Feb 2019 00:36:17 +0000 (00:36 +0000)]
install-deps.sh: Fixes for RHEL 7
Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit
a1a3e7960cf2c792ac8c9c71e68caa0ebada8933 )
Conflicts:
install-deps.sh
Yuri Weinstein [Thu, 3 Oct 2019 23:45:27 +0000 (16:45 -0700)]
Merge pull request #29242 from smithfarm/wip-38277-mimic
mimic: core: mon,osd: limit MOSDMap messages by size as well as map count
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Thu, 3 Oct 2019 23:39:33 +0000 (16:39 -0700)]
Merge pull request #29249 from smithfarm/wip-38852-mimic
mimic: core: .mgrstat failed to decode mgrstat state; luminous dev version?
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Thu, 3 Oct 2019 23:37:50 +0000 (16:37 -0700)]
Merge pull request #29247 from smithfarm/wip-38437-mimic
mimic: core: crc cache should be invalidated when posting preallocated rx buffers
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Thu, 3 Oct 2019 23:37:05 +0000 (16:37 -0700)]
Merge pull request #29593 from pdvian/wip-40884-mimic
mimic: mon/MgrMonitor: fix null deref when invalid formatter is specified
Yuri Weinstein [Thu, 3 Oct 2019 23:36:34 +0000 (16:36 -0700)]
Merge pull request #29732 from pdvian/wip-40949-mimic
mimic: Better default value for osd_snap_trim_sleep