]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomon/PGMap: add purged_snaps map to PGMapDigest
Sage Weil [Fri, 13 Oct 2017 02:57:48 +0000 (21:57 -0500)]
mon/PGMap: add purged_snaps map to PGMapDigest

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: share purged_snaps with mgr at mimic
Sage Weil [Thu, 12 Oct 2017 21:26:37 +0000 (16:26 -0500)]
osd/PG: share purged_snaps with mgr at mimic

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/osd_types: add purged_snaps to pg_stat_t
Sage Weil [Thu, 12 Oct 2017 21:14:52 +0000 (16:14 -0500)]
osd/osd_types: add purged_snaps to pg_stat_t

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd,mon: add 'nosnaptrim' osd flag
Sage Weil [Fri, 1 Dec 2017 15:00:49 +0000 (09:00 -0600)]
osd,mon: add 'nosnaptrim' osd flag

Now

 ceph osd {set,unset} nosnaptrim

will suspend or resume snap trimming.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosdc/Objecter: apply removed_snaps from gap to in-flight requests
Sage Weil [Thu, 12 Oct 2017 20:56:01 +0000 (15:56 -0500)]
osdc/Objecter: apply removed_snaps from gap to in-flight requests

If we are so laggy that we aren't contiguous with the mon's latest
map, the mon will provide a summary of removed_snaps for the gap.
Apply those to our in-flight ops.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosdc/Objecter: rename _scan_requests force_resend -> skipped_map
Sage Weil [Thu, 12 Oct 2017 20:49:00 +0000 (15:49 -0500)]
osdc/Objecter: rename _scan_requests force_resend -> skipped_map

This is what the caller is passing.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosdc/Objecter: prune new_removed_snaps from active op snapc's
Sage Weil [Thu, 12 Oct 2017 19:33:42 +0000 (14:33 -0500)]
osdc/Objecter: prune new_removed_snaps from active op snapc's

If an in-flight Op has a snapc referencing a deleted snap, remove it
from the snapc.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/MgrStatMonitor: dump PGMapDigest at debug level 20
Sage Weil [Wed, 29 Nov 2017 14:49:31 +0000 (08:49 -0600)]
mon/MgrStatMonitor: dump PGMapDigest at debug level 20

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/OSDMonitor: share snaps removed during a map gap
Sage Weil [Thu, 12 Oct 2017 20:44:48 +0000 (15:44 -0500)]
mon/OSDMonitor: share snaps removed during a map gap

If a client requests a map older than the mon's oldest, share with
them snaps deleted during the gap too.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/OSDMonitor: record removed_snaps by epoch outside of the osdmap
Sage Weil [Fri, 13 Oct 2017 17:32:36 +0000 (12:32 -0500)]
mon/OSDMonitor: record removed_snaps by epoch outside of the osdmap

Index by snap and by epoch; separate out pools.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/OSDMap: track newly removed and purged snaps in each epoch
Sage Weil [Wed, 11 Oct 2017 19:17:39 +0000 (14:17 -0500)]
osd/OSDMap: track newly removed and purged snaps in each epoch

Instead of maintaining a set of snapids that have been removed over
all time, instead note just the newly removed and newly purged snaps
in each OSDMap epoch.  This is easier to consume for both the Objecter
and OSD.

Also keep the interval of snaps that have been removed but not perged
in each OSDMap.  This is extremely convenient because it frees the OSDs
from having to maintain this information in parallel even when they may
not have PGs belonging to those pools.  These structures will be large
right when the ugprade happens and the pg_pool_t::removed_snaps gets copied
to the new fields, but in the steady state it will be relatively small,
reflecting only the set of snaps that are currently being removed.

This also provides convenient visibility into the "trimming snaps" set
that the cluster is working on.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/OSDMonitor: clear pending_metadata* in create_pending
Sage Weil [Thu, 12 Oct 2017 20:16:35 +0000 (15:16 -0500)]
mon/OSDMonitor: clear pending_metadata* in create_pending

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/OSDMonitor: reset OSDMap state before decode
Sage Weil [Fri, 13 Oct 2017 22:11:38 +0000 (17:11 -0500)]
mon/OSDMonitor: reset OSDMap state before decode

This ensures we don't have any cruft left over in fields that decode()
assumes are initialized from the ctor (and not a previous instance).

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomds/SnapServer: fix reset()
Sage Weil [Tue, 17 Oct 2017 21:47:22 +0000 (16:47 -0500)]
mds/SnapServer: fix reset()

pg_pool_t's snap_seq is an upper bound on any allocated (or removed)
snapids.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/osd_types: SnapSet: remove get_first_snap_after()
Sage Weil [Sat, 28 Oct 2017 20:01:39 +0000 (15:01 -0500)]
osd/osd_types: SnapSet: remove get_first_snap_after()

No users.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/types: flat_set operator<<
Sage Weil [Mon, 16 Oct 2017 19:27:59 +0000 (14:27 -0500)]
include/types: flat_set operator<<

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/mempool: add flat_set alias
Sage Weil [Mon, 16 Oct 2017 19:25:30 +0000 (14:25 -0500)]
include/mempool: add flat_set alias

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoinclude/interval_set: add get_end() to iterator
Sage Weil [Mon, 30 Oct 2017 15:20:43 +0000 (10:20 -0500)]
include/interval_set: add get_end() to iterator

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/suites/rados/singleton/all/thrash-eio: more whitelist
Sage Weil [Sat, 2 Dec 2017 03:15:35 +0000 (21:15 -0600)]
qa/suites/rados/singleton/all/thrash-eio: more whitelist

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/OSDMap: improve osdmap flag dumping in json
Sage Weil [Fri, 1 Dec 2017 15:24:27 +0000 (09:24 -0600)]
osd/OSDMap: improve osdmap flag dumping in json

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: share_pg_info shares past_itnervals, not PastIntervals()
Sage Weil [Fri, 1 Dec 2017 15:27:21 +0000 (09:27 -0600)]
osd/PG: share_pg_info shares past_itnervals, not PastIntervals()

In reality we only call this when the PG is peered and thus past_intervals
is empty, but this is more defensive in case that changes someday!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/osd_types: note about removed_snaps hack
Sage Weil [Fri, 13 Oct 2017 21:52:00 +0000 (16:52 -0500)]
osd/osd_types: note about removed_snaps hack

We add in the new snap_seq just to try to keep the interval_set
contiguous.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18974 from liewegas/wip-22145
Sage Weil [Wed, 29 Nov 2017 18:48:37 +0000 (12:48 -0600)]
Merge pull request #18974 from liewegas/wip-22145

osd/PG: restart recovery if NotRecovering and unfound found

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd/PG: restart recovery if NotRecovering and unfound found 18974/head
Sage Weil [Thu, 16 Nov 2017 20:26:27 +0000 (14:26 -0600)]
osd/PG: restart recovery if NotRecovering and unfound found

If we are in recovery_unfound state waiting for unfound objects, and we
find them, we need to restart the recovery reservation process so that we
can recover.  Do this by queueing DoRecover() event instead of calling
queue_recovery() (which won't do anything since we're not in
recoverying|backfilling pg states).

Make the parent Active state ignore DoRecovery so that if we are already
in some phase of recovery/backfill the event gets ignored.  It is already
handled by the other important substates that care, like Clean (for
repair's benefit).

I'm not sure why states like Activating are paying attention tot his vevent...

Fixes: http://tracker.ceph.com/issues/22145
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18954 from adamemerson/wip-hole-in-the-bucket-dear-liza
Adam C. Emerson [Wed, 29 Nov 2017 18:17:12 +0000 (13:17 -0500)]
Merge pull request #18954 from adamemerson/wip-hole-in-the-bucket-dear-liza

rgw: Add try_refresh_bucket_info function
rgw: Add retry_raced_bucket_write
rgw: Handle stale bucket info in RGWPutMetadataBucket
rgw: Handle stale bucket info in RGWSetBucketVersioning
rgw: Handle stale bucket info in RGWSetBucketWebsite
rgw: Handle stale bucket info in RGWDeleteBucketWebsite
rgw: Handle stale bucket info in RGWPutBucketPolicy
rgw: Handle stale bucket info in RGWDeleteBucketPolicy
rgw: Expire entries in bucket info cache

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #19215 from joscollin/wip-mount-fuse-ceph-typo
Jos Collin [Wed, 29 Nov 2017 17:18:07 +0000 (22:48 +0530)]
Merge pull request #19215 from joscollin/wip-mount-fuse-ceph-typo

doc: Fix typo in mount.fuse.ceph

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19209 from joscollin/wip-githubman-ktdreyer
Jos Collin [Wed, 29 Nov 2017 17:15:23 +0000 (22:45 +0530)]
Merge pull request #19209 from joscollin/wip-githubman-ktdreyer

githubmap: Add ktdreyer

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19208 from tchaikov/wip-spdk-17.10
Kefu Chai [Wed, 29 Nov 2017 16:39:18 +0000 (00:39 +0800)]
Merge pull request #19208 from tchaikov/wip-spdk-17.10

 spdk: update SPDK to v17.10

Reviewed-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #19238 from tchaikov/wip-22266
Josh Durgin [Wed, 29 Nov 2017 16:19:40 +0000 (08:19 -0800)]
Merge pull request #19238 from tchaikov/wip-22266

tools/ceph_monstore_tool: rebuild initial mgrmap also

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
7 years agoMerge pull request #19079 from adamemerson/wip-static-ptr
Matt Benjamin [Wed, 29 Nov 2017 16:17:22 +0000 (11:17 -0500)]
Merge pull request #19079 from adamemerson/wip-static-ptr

Static Pointer

7 years agodoc: Fix typo in mount.fuse.ceph 19215/head
Jos Collin [Tue, 28 Nov 2017 17:34:10 +0000 (23:04 +0530)]
doc: Fix typo in mount.fuse.ceph

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge PR #19212 into master
Patrick Donnelly [Wed, 29 Nov 2017 15:20:19 +0000 (07:20 -0800)]
Merge PR #19212 into master

* refs/pull/19212/head:
doc: Add section about MDS cache limits

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19213 from ceph/wip-bz1518264
Andrew Schoen [Wed, 29 Nov 2017 15:05:56 +0000 (09:05 -0600)]
Merge pull request #19213 from ceph/wip-bz1518264

ceph-volume: correctly fallback to bluestore when no objectstore is specified

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #18267 from joscollin/wip-update-radosgw-admin-doc
Orit Wasserman [Wed, 29 Nov 2017 13:08:47 +0000 (15:08 +0200)]
Merge pull request #18267 from joscollin/wip-update-radosgw-admin-doc

doc: Update commands and options in radosgw-admin
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agotools/ceph_monstore_tool: rebuild initial mgrmap also 19238/head
Kefu Chai [Wed, 29 Nov 2017 12:21:33 +0000 (20:21 +0800)]
tools/ceph_monstore_tool: rebuild initial mgrmap also

Fixes: http://tracker.ceph.com/issues/22266
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18649 from b-ranto/wip-restful-fixes
John Spray [Wed, 29 Nov 2017 12:11:58 +0000 (12:11 +0000)]
Merge pull request #18649 from b-ranto/wip-restful-fixes

mgr/restful: A couple of restful fixes

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agodoc: Add section about MDS cache limits 19212/head
Barbora Ančincová [Tue, 28 Nov 2017 13:02:31 +0000 (14:02 +0100)]
doc: Add section about MDS cache limits

Signed-off-by: Bara Ancincova (bara@redhat.com)
7 years agodoc: Update all OPTIONS sections in radosgw-admin 18267/head
Jos Collin [Thu, 12 Oct 2017 11:09:25 +0000 (16:39 +0530)]
doc: Update all OPTIONS sections in radosgw-admin

Updated all OPTIONS sections in RADOSGW-ADMIN doc page, using the latest options from rgw_admin.cc::usage()

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agocmake,rpm,deb: update to accommodate SPDK v17.10 19208/head
Kefu Chai [Tue, 28 Nov 2017 10:00:37 +0000 (18:00 +0800)]
cmake,rpm,deb: update to accommodate SPDK v17.10

* cmake/modules/BuildSPDK.cmake: add lvol
* cmake/modules/BuildDPDK.cmake: add pci and bus_pci
* ceph.spec.in, cmake/modules/BuildSPDK.cmake, debian/control:
  re-introduce libuuid dependency, as 17.07 added lvol. and the latter
  depends on uuid.
* cmake/modules/BuildSPDK.cmake: avoid introducing local variable of
  `iface_libs`.
* cmake/modules/patch-dpdk-conf.sh: disable
  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES, this option introduces the
  balanced allocation of memory. but it also requires libnuma-dev.
  let's disable it for now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #9571 from yehudasa/wip-rgw-redirect-zone
Kefu Chai [Wed, 29 Nov 2017 08:38:54 +0000 (16:38 +0800)]
Merge pull request #9571 from yehudasa/wip-rgw-redirect-zone

rgw: add a default redirect field for zones

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #19159 from shinobu-x/drop_using_namespace_std
Kefu Chai [Wed, 29 Nov 2017 08:16:39 +0000 (16:16 +0800)]
Merge pull request #19159 from shinobu-x/drop_using_namespace_std

common: drop namespace using directives for std

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #19165 from xiaoxichen/fix_used_pct
Kefu Chai [Wed, 29 Nov 2017 08:14:40 +0000 (16:14 +0800)]
Merge pull request #19165 from xiaoxichen/fix_used_pct

mon/PGMap: Fix %USED calculation bug.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19156 from cyx1231st/fix_blkin_tracing
Kefu Chai [Wed, 29 Nov 2017 08:13:34 +0000 (16:13 +0800)]
Merge pull request #19156 from cyx1231st/fix_blkin_tracing

blkin: Fix unconditional tracing in OSD

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19149 from rzarzynski/wip-common-perfguards
Kefu Chai [Wed, 29 Nov 2017 08:12:57 +0000 (16:12 +0800)]
Merge pull request #19149 from rzarzynski/wip-common-perfguards

common:  RAII-styled mechanism for updating PerfCounters

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19112 from xiaoxichen/osd_mapped_pool
Kefu Chai [Wed, 29 Nov 2017 08:12:02 +0000 (16:12 +0800)]
Merge pull request #19112 from xiaoxichen/osd_mapped_pool

OSD/admin_socket: add get_mapped_pools command

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18959 from cooboos/wip-cephdencoder-LCtype
Kefu Chai [Wed, 29 Nov 2017 08:10:46 +0000 (16:10 +0800)]
Merge pull request #18959 from cooboos/wip-cephdencoder-LCtype

ceph-dencoder: add support for RGWLifecycleConfiguration

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19174 from smithfarm/wip-cmake-exclude-gitignore
Kefu Chai [Wed, 29 Nov 2017 07:39:14 +0000 (15:39 +0800)]
Merge pull request #19174 from smithfarm/wip-cmake-exclude-gitignore

cmake: mgr: exclude .gitignore

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #18938 from tchaikov/wip-cmake
Kefu Chai [Wed, 29 Nov 2017 07:38:16 +0000 (15:38 +0800)]
Merge pull request #18938 from tchaikov/wip-cmake

cmake: check gcc version not release date for libstdc++ saneness

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge PR #19206 into master
Patrick Donnelly [Tue, 28 Nov 2017 20:02:52 +0000 (12:02 -0800)]
Merge PR #19206 into master

* refs/pull/19206/head:
doc: add pre-requisite to enable CephFS snapshot

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agocommon: Add static_ptr 19079/head
Adam C. Emerson [Tue, 21 Nov 2017 19:13:48 +0000 (14:13 -0500)]
common: Add static_ptr

Add static_ptr, a pointer-like class that contains its own storage,
avoiding use of the heap.

The full range of *_pointer_cast functions are included.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #19199 from tchaikov/wip-22136
Kefu Chai [Tue, 28 Nov 2017 15:46:49 +0000 (23:46 +0800)]
Merge pull request #19199 from tchaikov/wip-22136

 qa/ceph-disk: enlarge the simulated SCSI disk

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.activate correct detection and fallback of objectstore flags 19213/head
Alfredo Deza [Tue, 28 Nov 2017 14:22:19 +0000 (09:22 -0500)]
ceph-volume lvm.activate correct detection and fallback of objectstore flags

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.devices.lvm verify objectstore flags in activate
Alfredo Deza [Tue, 28 Nov 2017 14:21:34 +0000 (09:21 -0500)]
ceph-volume tests.devices.lvm verify objectstore flags in activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #19163 from vshankar/rbd-image-map-mem-leak
Jason Dillaman [Tue, 28 Nov 2017 14:03:12 +0000 (09:03 -0500)]
Merge pull request #19163 from vshankar/rbd-image-map-mem-leak

rbd-mirror: ImageMap memory leak fixes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years ago.githubmap: Add ktdreyer 19209/head
Jos Collin [Tue, 28 Nov 2017 11:14:11 +0000 (16:44 +0530)]
.githubmap: Add ktdreyer

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #19172 from joscollin/wip-mount-fuse-ceph-doc
Jos Collin [Tue, 28 Nov 2017 11:08:13 +0000 (16:38 +0530)]
Merge pull request #19172 from joscollin/wip-mount-fuse-ceph-doc

doc: doc for mount.fuse.ceph

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agodoc: doc for mount.fuse.ceph 19172/head
Jos Collin [Mon, 27 Nov 2017 10:46:35 +0000 (16:16 +0530)]
doc: doc for mount.fuse.ceph

Created doc for mount.fuse.ceph.

Fixes: http://tracker.ceph.com/issues/21539
Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agospdk: update SPDK to v17.10
Kefu Chai [Tue, 28 Nov 2017 09:59:58 +0000 (17:59 +0800)]
spdk: update SPDK to v17.10

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest_multi: add a test for zone redirect 9571/head
Yehuda Sadeh [Sun, 17 Sep 2017 12:10:41 +0000 (05:10 -0700)]
test_multi: add a test for zone redirect

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agorgw-admin: add option to configure redirect_zone
Yehuda Sadeh [Sun, 17 Sep 2017 09:30:25 +0000 (02:30 -0700)]
rgw-admin: add option to configure redirect_zone

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agodoc: add pre-requisite to enable CephFS snapshot 19206/head
rune [Tue, 28 Nov 2017 08:25:17 +0000 (16:25 +0800)]
doc: add pre-requisite to enable CephFS snapshot
Signed-off-by: Jian Su <sujian@umcloud.com>
7 years agoqa/ceph-disk: enlarge the simulated SCSI disk 19199/head
Kefu Chai [Tue, 28 Nov 2017 06:42:31 +0000 (14:42 +0800)]
qa/ceph-disk: enlarge the simulated SCSI disk

100MB will be allocated for journal, and the remaining 100MB is for data
device. taking the inode into consideration, there will be approximately
87988 kB available for the activated OSD. and it will complain with a
"nearfull" state.

Fixes: http://tracker.ceph.com/issues/22136
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-disk: should throw if fail to read key-management-mode
Kefu Chai [Tue, 28 Nov 2017 06:41:31 +0000 (14:41 +0800)]
ceph-disk: should throw if fail to read key-management-mode

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-disk: fix the logging messages
Kefu Chai [Mon, 27 Nov 2017 08:36:34 +0000 (16:36 +0800)]
ceph-disk: fix the logging messages

logging.Logger.warn(format, *args). so no need to prepar a string
for it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-disk: path_set_context() after rename()
Kefu Chai [Mon, 27 Nov 2017 08:35:56 +0000 (16:35 +0800)]
ceph-disk: path_set_context() after rename()

it does not matter if we chown/restorecon before or after the rename,
but the logging message looks better this way: instead of fixing the
.tmp files, we are updating the attributes of the dest files w/o
.${pid}.tmp extension.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/workunits/ceph-disk: do not redirect stderr to stdout
Kefu Chai [Mon, 27 Nov 2017 04:08:04 +0000 (12:08 +0800)]
qa/workunits/ceph-disk: do not redirect stderr to stdout

normally, if we care about the output of ceph-disk, we expect a json
string, and ceph-disk sends the output to stdout, and errors/warnings
to stderr. so everything works as expected. and the test should also
follow this tradition. for example, if deprecated warnings are printed,
the warning message should not be collected along with the json string.

see also: d44334f3

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomon/PGMap: Fix %USED calculation bug. 19165/head
Xiaoxi Chen [Mon, 27 Nov 2017 05:51:58 +0000 (22:51 -0700)]
mon/PGMap: Fix %USED calculation bug.

Previous code forgot to multiple raw_used_ratio to calculate
used byte.

Fixes: http://tracker.ceph.com/issues/22247
Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
7 years agorgw: Expire entries in bucket info cache 18954/head
Adam C. Emerson [Fri, 17 Nov 2017 22:15:26 +0000 (17:15 -0500)]
rgw: Expire entries in bucket info cache

To bound the degree to which an RGW instance can go out to lunch if
the watch/notify breaks down, force refresh of any cache entry over a
certain age.

Fifteen minutes by default, and expiration can be turned off entirely.

This is separate from the LRU. The LRU removes entries based on the
last time of access. This expiration patch forces refresh based on the
last time they were updated.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Handle stale bucket info in RGWDeleteBucketPolicy
Adam C. Emerson [Fri, 17 Nov 2017 21:16:38 +0000 (16:16 -0500)]
rgw: Handle stale bucket info in RGWDeleteBucketPolicy

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Handle stale bucket info in RGWPutBucketPolicy
Adam C. Emerson [Fri, 17 Nov 2017 21:15:04 +0000 (16:15 -0500)]
rgw: Handle stale bucket info in RGWPutBucketPolicy

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Handle stale bucket info in RGWDeleteBucketWebsite
Adam C. Emerson [Fri, 17 Nov 2017 21:05:06 +0000 (16:05 -0500)]
rgw: Handle stale bucket info in RGWDeleteBucketWebsite

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Handle stale bucket info in RGWSetBucketWebsite
Adam C. Emerson [Fri, 17 Nov 2017 21:03:13 +0000 (16:03 -0500)]
rgw: Handle stale bucket info in RGWSetBucketWebsite

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Handle stale bucket info in RGWSetBucketVersioning
Adam C. Emerson [Fri, 17 Nov 2017 20:59:44 +0000 (15:59 -0500)]
rgw: Handle stale bucket info in RGWSetBucketVersioning

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Handle stale bucket info in RGWPutMetadataBucket
Adam C. Emerson [Fri, 17 Nov 2017 20:53:05 +0000 (15:53 -0500)]
rgw: Handle stale bucket info in RGWPutMetadataBucket

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Add retry_raced_bucket_write
Adam C. Emerson [Fri, 17 Nov 2017 20:51:42 +0000 (15:51 -0500)]
rgw: Add retry_raced_bucket_write

If the OSD informs us that our bucket info is out of date when we need
to write, we should have a way to update it.

This template function allows us to wrap relevant sections of code so
they'll be retried against new bucket info on -ECANCELED.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agorgw: Add try_refresh_bucket_info function
Adam C. Emerson [Thu, 16 Nov 2017 19:42:58 +0000 (14:42 -0500)]
rgw: Add try_refresh_bucket_info function

Sometimes operations fail with -ECANCELED. This means we got raced. If
this happens we should update our bucket info from cache and try again.

Some user reports suggest that our cache may be getting and staying
out of sync. This is a bug and should be fixed, but it would also be
nice if we were robust enough to notice the problem and refresh.

So in that case, we invalidate the cache and fetch direct from the
OSD, putting a warning in the log.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #19182 from cbodley/wip-beast-v124
Matt Benjamin [Mon, 27 Nov 2017 19:27:34 +0000 (14:27 -0500)]
Merge pull request #19182 from cbodley/wip-beast-v124

submodule: update Beast to ceph/ceph-master branch

7 years agosubmodule: update Beast to ceph/ceph-master branch 19182/head
Casey Bodley [Mon, 27 Nov 2017 19:16:33 +0000 (14:16 -0500)]
submodule: update Beast to ceph/ceph-master branch

pulls beast submodule up from v116 tag to v124, with an additional bug
fix for async_read_some()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19175 from liewegas/wip-rest-test
Yuri Weinstein [Mon, 27 Nov 2017 17:20:44 +0000 (09:20 -0800)]
Merge pull request #19175 from liewegas/wip-rest-test

qa/suites/rados/rest: move rest_test from qa/suites/rest/

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
7 years agoqa/suites/rados/rest: move rest_test from qa/suites/rest/ 19175/head
Sage Weil [Mon, 27 Nov 2017 16:11:51 +0000 (10:11 -0600)]
qa/suites/rados/rest: move rest_test from qa/suites/rest/

...and add more health whitelists.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocmake: mgr: exclude .gitignore 19174/head
Nathan Cutler [Mon, 27 Nov 2017 14:09:39 +0000 (15:09 +0100)]
cmake: mgr: exclude .gitignore

Fixes RPMLINT warning:

ceph-mgr.x86_64: W: version-control-internal-file /usr/lib64/ceph/mgr/.gitignore
ceph-mgr.x86_64: W: version-control-internal-file /usr/lib64/ceph/mgr/dashboard/static/AdminLTE-2.3.7/.gitignore
You have included file(s) internally used by a version control system in the
package. Move these files out of the package and rebuild it.

Note: the backslash has to be doubled up for the regex to make
it through CMake.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #19109 from mikulely/main-cleanup
Casey Bodley [Mon, 27 Nov 2017 14:16:48 +0000 (09:16 -0500)]
Merge pull request #19109 from mikulely/main-cleanup

rgw: drop useless includes in rgw_{main.cc, common.h}

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agocommon: introduce PerfGuard to PerfCounters. 19149/head
Radoslaw Zarzynski [Fri, 24 Nov 2017 16:38:33 +0000 (17:38 +0100)]
common: introduce PerfGuard to PerfCounters.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #18935 from cfanz/cfanz-version-id-wip
Casey Bodley [Mon, 27 Nov 2017 14:12:34 +0000 (09:12 -0500)]
Merge pull request #18935 from cfanz/cfanz-version-id-wip

rgw:send x-amz-version-id header when upload files

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18981 from yaozongyou/fix-rgw-bi-decode-bug
Casey Bodley [Mon, 27 Nov 2017 14:09:31 +0000 (09:09 -0500)]
Merge pull request #18981 from yaozongyou/fix-rgw-bi-decode-bug

cls/rgw: mtime in rgw_bucket_dir_entry_meta not really decoded

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18978 from yaozongyou/wip-radosgw-admin-add-check
Casey Bodley [Mon, 27 Nov 2017 14:08:59 +0000 (09:08 -0500)]
Merge pull request #18978 from yaozongyou/wip-radosgw-admin-add-check

rgw-admin: check the data extra pool supports omap

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #18962 from ZVampirEM77/wip-em-readlen
Casey Bodley [Mon, 27 Nov 2017 14:08:23 +0000 (09:08 -0500)]
Merge pull request #18962 from ZVampirEM77/wip-em-readlen

rgw: check read_op.read return value in RGWRados::copy_obj_data

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #19130 from trociny/wip-mirror-enable-cleanup
Jason Dillaman [Mon, 27 Nov 2017 14:06:19 +0000 (09:06 -0500)]
Merge pull request #19130 from trociny/wip-mirror-enable-cleanup

librbd: update mirror::EnableRequest diagram according to code

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/restful: Test pg_num/pgp_num modifications 18649/head
Boris Ranto [Mon, 27 Nov 2017 13:35:26 +0000 (14:35 +0100)]
qa/restful: Test pg_num/pgp_num modifications

Signed-off-by: Boris Ranto <branto@redhat.com>
7 years agoMerge pull request #19128 from joscollin/wip-mountfuseceph-typo
Jos Collin [Mon, 27 Nov 2017 11:58:21 +0000 (17:28 +0530)]
Merge pull request #19128 from joscollin/wip-mountfuseceph-typo

mount.fuse.ceph: Fix typo

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoblkin: fix unconditional tracing 19156/head
Yingxin [Mon, 27 Nov 2017 10:02:25 +0000 (05:02 -0500)]
blkin: fix unconditional tracing

Blkin trace will be triggered unconditionally at OSD `issue_op`, even if
op->pg_trace is not initialized. This issue introduces unnecessary
overhead and confusing tracing records when blkin tracing is ON.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
7 years agoMerge pull request #19169 from wwba/fix-ceph-bluestore-tool-man-page
Jos Collin [Mon, 27 Nov 2017 09:36:10 +0000 (15:06 +0530)]
Merge pull request #19169 from wwba/fix-ceph-bluestore-tool-man-page

doc: drop duplicate line in ceph-bluestore-tool man page

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: remove duplicate line from ceph-authtool man page 19168/head 19169/head
Xiaojun Liao [Mon, 27 Nov 2017 07:49:02 +0000 (15:49 +0800)]
doc: remove duplicate line from ceph-authtool man page

Signed-off-by: Xiaojun Liao <xiaojunliao85@gmail.com>
7 years agoceph-dencoder: add support for RGWLifecycleConfiguration 18959/head
wangsongbo [Thu, 16 Nov 2017 03:38:58 +0000 (11:38 +0800)]
ceph-dencoder: add support for RGWLifecycleConfiguration

Signed-off-by: Songbo Wang wangsongbo@cloudin.cn
7 years agorbd-mirror: ImageMap memory leak fixes 19163/head
Venky Shankar [Tue, 21 Nov 2017 16:27:40 +0000 (11:27 -0500)]
rbd-mirror: ImageMap memory leak fixes

Signed-off-by: Venky Shankar <vshankar@redhat.com>
7 years agocmake: silence CMP0054 warning 18938/head
Kefu Chai [Mon, 27 Nov 2017 04:39:41 +0000 (12:39 +0800)]
cmake: silence CMP0054 warning

see https://gitlab.kitware.com/cmake/cmake/issues/17381 and
https://gitlab.kitware.com/cmake/cmake/commit/a8be8b1b54fe1922a1d1fc0365c3ae5c918b6654,
so before the updated cmake is released and packaged. we should
add this setting.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years ago[cleanup] Remove namespace using directives for std 19159/head
Shinobu Kinjo [Mon, 27 Nov 2017 04:46:58 +0000 (13:46 +0900)]
[cleanup] Remove namespace using directives for std

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
7 years agoMerge pull request #19154 from Fusl/master
Xie Xingguo [Mon, 27 Nov 2017 00:21:56 +0000 (08:21 +0800)]
Merge pull request #19154 from Fusl/master

doc: correcting typos in bluestore-config-ref and bluestore-migration

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agodoc: correcting typos in bluestore-config-ref and bluestore-migration 19154/head
Katie Holly [Sun, 26 Nov 2017 16:47:35 +0000 (17:47 +0100)]
doc: correcting typos in bluestore-config-ref and bluestore-migration

Signed-off-by: Katie Holly <git@meo.ws>
7 years agoMerge pull request #18961 from tchaikov/wip-rgw-print-iam-policy
Kefu Chai [Sun, 26 Nov 2017 09:53:18 +0000 (17:53 +0800)]
Merge pull request #18961 from tchaikov/wip-rgw-print-iam-policy

rgw: iam policy printing cleanups

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