Commit Graph

79269 Commits

Author SHA1 Message Date
Sage Weil
2482b4cc91 osd/PG: clean up set_force_{recovery,backfill} interface
- update state under pg lock
- clean up PG interface
- log only when we adjust the state

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
a7e1a73ae8 osd/PG: start grouping public interface at top of class
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
2bfaa8b1aa osd/PG: is_deleting()
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
7ebf2a76bf osd/PG: clean up intrusive_ptr helpers
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
7c1cba8a0c osd/PG: protect everything that doesn't have to be public
This lets us see what the *actual* public interface is that we are using.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
9ecd628acb osd/PG: get_acting()
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
3ca232e650 osd/PG: add set_last_scrub_stamp
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
58684c5827 osd/PG: add get_history() accessor
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
c1893d24c2 osd/PG: inline lock_suspend_timeout
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
487225d111 osd/PG: add get_last_user_version()
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
23cabcacc3 osd: use PG::get_pgid() instead of info.pgid
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 13:08:17 -05:00
Sage Weil
b73346df0b Merge pull request #18049 from liewegas/wip-kv-iterator
kv/KeyValueDB: add column family

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
2017-10-06 13:07:57 -05:00
Sage Weil
8f5c081b08 Merge pull request #18156 from theanalyst/doc-changelog-rename
doc: rename changelog with a .txt extension
2017-10-06 12:55:59 -05:00
Kefu Chai
9f0b76eeb9 Merge pull request #17442 from tchaikov/wip-test-throttle
test/throttle: kill tests exercising dtor of Throttle classes

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-07 01:52:10 +08:00
Abhishek Lekshmanan
c3a28114e7 doc: rename changelog with a .txt extension
Since this is used to x-ref in the release notes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-10-06 18:40:18 +02:00
Abhishek L
1cbaef7a66 Merge pull request #18148 from theanalyst/doc-10.2.10-release-notes
doc: release notes update for 10.2.10

Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-By: Sage Weil <sage@redhat.com>
2017-10-06 18:30:37 +02:00
Sage Weil
b1abcb219c Merge pull request #18155 from smithfarm/wip-doc-releases-tweak
doc: improve links in doc/releases.rst
2017-10-06 11:06:46 -05:00
Nathan Cutler
4eecad5524 doc: improve links in doc/releases.rst
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-10-06 17:49:01 +02:00
Abhishek Lekshmanan
12572f449b doc: update releases table with v10.2.10 Jewel
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-10-06 17:05:36 +02:00
Abhishek Lekshmanan
e5630e7350 doc: add release notes to v10.2.10 jewel
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-10-06 17:02:59 +02:00
Sage Weil
b0a4182876 Merge pull request #18153 from liewegas/wip-lts
doc/releases: drop LTS/stable line from second chart

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-10-06 09:54:58 -05:00
Sage Weil
ea40e88ba3 doc/releases: tweaks
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 09:42:52 -05:00
Sage Weil
d8da4f749a doc/releases: drop LTS/stable line from second chart
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 09:15:08 -05:00
Abhishek L
d71a42c892 Merge pull request #18152 from ceph/wip-fix-doc-exceptions
doc raise exceptions with a base class

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-10-06 15:55:46 +02:00
Sage Weil
1ebb46677f Merge pull request #18117 from liewegas/wip-lts
doc/releases: update release cycle docs

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-10-06 08:53:56 -05:00
Sage Weil
158cc11b59 doc/releases: update release cycle docs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-06 08:51:51 -05:00
Xie Xingguo
f640cebe84 Merge pull request #18150 from xiexingguo/wip-21618
qa/standalone/scrub/osd-scrub-repair.sh: drop omap_digest flag

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-06 21:50:18 +08:00
Alfredo Deza
9e2a52ccec doc parse two lines for getting the context
So that signatures can get parsed when they are split like:

PG::RecoveryState::RepWaitBackfillReserved::react(
  const RemoteReservationCanceled &evt)

Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-10-06 09:10:26 -04:00
Sage Weil
d509468ac7 Merge pull request #18151 from theanalyst/doc-changelog-10.2.10
doc: Adding changelog for 10.2.10
2017-10-06 07:34:29 -05:00
Alfredo Deza
347b7b1f19 doc raise exceptions with a base class
Although valid in very old Python, it is no longer possible to raise
"bare" exceptions without a class.

Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-10-06 08:03:36 -04:00
Abhishek Lekshmanan
b9c94c418d doc: Adding changelog for 10.2.10
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-10-06 13:52:29 +02:00
Sage Weil
886606bfd7 qa/standalone/scrub/osd-scrub-repair.sh: drop omap_digest flag
This is no longer set if we are backed by bluestore, which we are by
default.  See be078c8b7b131764caa28bc44452b8c5c2339623

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-06 19:25:40 +08:00
Kefu Chai
54d9b65936 test/common/unittest_throttle: drop tests exercising dtors
quote from Adam,

> let's just remove all the destructor tests. Since it's just exercising
> an assertion, it's most likely to be complexity that doesn't buy us
> much.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-06 19:22:19 +08:00
Kefu Chai
f57560d9f0 Merge pull request #18064 from tchaikov/wip-vectors-equal
osd: replace vectors_equal() with operator==(vector<>, vector<>)

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-06 17:24:50 +08:00
huangjun
838e12cfc8 qa/suites/rest/basic/tasks/rest_test: whiltelist OSD_DOWN
Fixes: http://tracker.ceph.com/issues/21425
Signed-off-by: huangjun <huangjun@xsky.com>
2017-10-06 11:59:50 +08:00
Patrick Donnelly
723cb35c30
Merge PR #18032 into master
* refs/pull/18032/head:
	Merge commit 'refs/pull/4/head' of github.com:batrick/ceph into ptl-tool-2
	script/ptl-tool.py: Label Validation
	Merge commit 'refs/pull/2/head' of github.com:batrick/ceph into ptl-tool-2
	Merge commit 'refs/pull/1/head' of github.com:batrick/ceph into ptl-tool-2
	script/ptl-tool.py: Fix the Comment example
	script/ptl-tool.py: Fixed error message
	ptl-tool: make more configurable and usable

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-10-05 19:37:03 -07:00
Patrick Donnelly
69254f2c63
githubmap: update contributors
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-05 19:37:02 -07:00
Patrick Donnelly
f3fe711202
Merge commit 'refs/pull/4/head' of github.com:batrick/ceph into ptl-tool-2
* refs/pull/4/head:
  script/ptl-tool.py: Label Validation
2017-10-05 19:35:09 -07:00
Gregory Farnum
42ab0e031d Merge pull request #18134 from liewegas/wip-21660
src/messages/MOSDMap: reencode OSDMap for older clients

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-10-05 15:30:13 -07:00
John Spray
177f06c925 Merge pull request #17974 from jcsp/wip-doc-mgr-iptables
doc: update firewall doc to mention ceph-mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-05 21:48:05 +01:00
Casey Bodley
4e65c9e9af rgw: RGWUser::init no longer overwrites user_id
if an admin op specifies a user_id and does not find a user with that
id, but does find a user based on a later field (email, access key,
etc), RGWUser::user_id will be overwritten with the existing user's id

when this happens on 'radosgw-admin user create', RGWUser::execute_add()
will modify that existing user, instead of trying to create a new user
with the given user_id (and failing due to the conflicting email,
access key, etc)

by preserving the original user_id (when specified), this uid conflict
is detected in RGWUser::check_op() and a "user id mismatch" error is
returned

Fixes: http://tracker.ceph.com/issues/21685

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-10-05 16:44:04 -04:00
Sage Weil
d2664aa34d src/messages/MOSDMap: reencode OSDMap for older clients
We explicitly select which missing bits trigger a reencode.  We
already had jewel and earlier covered, but kraken includes all of
the previously mentioned bits but not SERVER_LUMINOUS.  This
prevents kraken clients from decoding luminous maps.

Fixes: http://tracker.ceph.com/issues/21660
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-05 15:26:16 -05:00
Sage Weil
882e6902f3 Merge pull request #18070 from liewegas/wip-21613
osd: fix replica/backfill target handling of REJECT

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-10-05 14:37:52 -05:00
Sage Weil
f4e4323022 kv/RocksDBStore: fix default CF handling
We need to close the default CF handle *only* if we explicitly opened it.

Also, take care to use that handle wherever we can.  This is mostly
paranoia--I'm not sure if rocksdb cares if you mix the handle you opened
with DefaultColumnFamily(), which is different.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-05 14:35:52 -05:00
Greg Farnum
0a691b2b1c osd: make the PG's SORTBITWISE assert a more generous shutdown
We want to stop working if we get activated while sortbitwise is not set
on the cluster, but we might have old maps where it wasn't if the flag
was changed recently. And doing it in the PG code was a bit silly anyway.

Instead check SORTBITWISE in the main OSDMap handling code prior to
prepublishing it. Let it go through if we aren't active at the time.

Fixes: http://tracker.ceph.com/issues/20416

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-10-05 10:48:58 -07:00
Matt Benjamin
58909e799b Merge pull request #17939 from mkogan1/wip-rgw-21196
rgw: update the usage read iterator in truncated scenario
2017-10-05 13:43:09 -04:00
Sage Weil
70916131d6 Merge pull request #18028 from liewegas/wip-pick-ifname
common/pick_address: add {public,cluster}_network_interface option

Reviewed-by: Dan Mick <dmick@redhat.com>
2017-10-05 12:02:49 -05:00
Adam C. Emerson
e089119134 build: Fix a couple uninitialized variable warnings
For GCC7.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-05 12:25:16 -04:00
Adam C. Emerson
7b784be0b9 kv: Fix overloaded virtual warning in KeyValueDBMemory
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-05 12:25:16 -04:00
Adam C. Emerson
d796bc7a76 rbd_mirror: Fix overloaded virtual warning in Clang++
Just pull in the original function with a using.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-05 12:25:16 -04:00