Sage Weil
4fc02a7f48
osd/OSDMap: include age in up and in counts for ceph status
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-07 09:07:50 -05:00
Sage Weil
f90fb41cdc
mon/OSDMonitor: set new_last_{up,in}_change
...
Capture up/down and in/out changes in encode_pending() so we don't have
to worry about the zillions of places and ways pending_inc can get
updated.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 10:28:45 -05:00
Sage Weil
d414f0b43a
osd/OSDMap: store last_up_change and last_in_change
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 10:28:45 -05:00
Sage Weil
e932ba4346
mgr/MgrMap: include mgr age in map printer
...
This appears in 'ceph status' output.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 10:28:45 -05:00
Sage Weil
8a5c70dd66
mon/MgrMap: track active_changed timestamp
...
Note the time when the active mgr changes (added or removed).
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 10:28:45 -05:00
Sage Weil
4d5a641e43
mon: include mon quorum age in status
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 10:28:45 -05:00
Sage Weil
a7043dbba6
include/utime: add utimespan_str helper
...
Just like timespan_str(), but for utime_t.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-06 10:28:45 -05:00
Kefu Chai
a6879a661f
Merge pull request #23846 from liewegas/wip-mgr-config-fixes
...
mon: fix mgr module config option handling
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-06 21:58:52 +08:00
huanwen ren
821b6b486c
Merge pull request #23836 from sepia-liu/wip-cephfuse-doc
...
doc/cephfs: fixup add/remove mds docs
2018-09-06 18:50:57 +08:00
Lenz Grimmer
b3eb7eec97
Merge pull request #23911 from votdev/cleanup
...
mgr/dashboard: Remove useless code
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-09-06 11:04:22 +02:00
Xie Xingguo
7a8ed0fe2c
Merge pull request #23948 from libingyang-zte/master
...
doc: Fix Spelling Error of Radosgw
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-06 12:10:20 +08:00
Kefu Chai
ab5212e776
Merge pull request #23947 from tchaikov/wip-test-msgr-include
...
test/msgr: add missing #include
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-06 10:00:47 +08:00
Xie Xingguo
42a518317a
Merge pull request #23926 from Gangbiao/lgb-devel
...
doc: Document correction
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-06 09:30:25 +08:00
李丙洋 10208981
b91d54976f
doc: Fix Spelling Error of Radosgw
...
Signed-off-by: Li Bingyang <li.bingyang1@zte.com.cn>
2018-09-06 08:43:11 +08:00
Kefu Chai
6d5705180d
Merge pull request #23850 from liewegas/wip-22544
...
osdc/Objecter: fix split vs reconnect race
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2018-09-06 08:33:31 +08:00
Kefu Chai
4a97e8452d
Merge pull request #23557 from liewegas/wip-cmd-getval
...
common/cmdparse: cmd_getval_throws -> cmd_getval
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-06 08:31:55 +08:00
Kefu Chai
bc679109e9
test/msgr: add missing #include
...
it's a regression introduced by #23930
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-06 08:24:16 +08:00
Patrick Donnelly
c7f6e03ece
Merge PR #23851 into master
...
* refs/pull/23851/head:
mds: print is_laggy message once
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-09-05 16:39:47 -07:00
Patrick Donnelly
11f42ef666
Merge PR #23890 into master
...
* refs/pull/23890/head:
msg: lower verbosity on normal event
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-05 16:39:41 -07:00
Patrick Donnelly
4399023119
mds: print is_laggy message once
...
Beacon::is_laggy gets called frequently which causes the debug log to get
spammed with messages.
Steps to reproduce:
- setup vstart cluster
- start IO from client (e.g. `cp -av /usr /mnt`)
- find connection to mon by the mds
$ ss -tnp | grep ceph-mds
...
ESTAB 0 0 127.0.0.1:58988 127.0.0.1:40928 users:(("ceph-mds",pid=13095,fd=37))
- block the connection using iptables on the MDS node:
$ sudo iptables -I INPUT -p tcp --sport 58988 --dport 40928 -j DROP
- verify MDS log using:
$ tail -f mds.a.log | grep beacon
...
2018-09-05 19:21:05.672 7f2908a9d700 1 mds.beacon.a is_laggy 19.8876 > 15 since last acked beacon
2018-09-05 19:21:05.672 7f2908a9d700 1 mds.beacon.a is_laggy 19.8876 > 15 since last acked beacon
2018-09-05 19:21:05.672 7f2908a9d700 1 mds.beacon.a is_laggy 19.8876 > 15 since last acked beacon
2018-09-05 19:21:05.672 7f2908a9d700 1 mds.beacon.a is_laggy 19.8876 > 15 since last acked beacon
2018-09-05 19:21:05.784 7f2905a97700 5 mds.beacon.a Sending beacon up:active seq 114
2018-09-05 19:21:05.784 7f2905a97700 1 -- 127.0.0.1:6813/2277776624 --> 127.0.0.1:40929/0 -- mdsbeacon(14162/a up:active seq 114 v7) v7 -- 0x7d1e7e2a80 con 0
2018-09-05 19:21:05.784 7f2905a97700 20 mds.beacon.a sender thread waiting interval 4s
Fixes: http://tracker.ceph.com/issues/35250
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-05 16:21:19 -07:00
Noah Watkins
db68a75ff6
Merge pull request #23645 from jcsp/wip-mgr-unknown-error
...
mgr: replace "Unknown error" string on always_on
Reviewed-by: Noah Watkins <nwatkins@redhat.com>
2018-09-05 16:02:34 -07:00
Jason Dillaman
016076ec68
Merge pull request #23942 from trociny/wip-rados-rmpool
...
qa/workunits/rbd: replace usage of 'rados rmpool'
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-05 17:33:57 -04:00
Mykola Golub
cec53e9bd2
qa/workunits/rbd: replace usage of 'rados rmpool'
...
This command was dropped.
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-09-05 22:52:20 +03:00
Patrick Donnelly
a68a827cec
Merge PR #23907 into master
...
* refs/pull/23907/head:
doc: Fix Spelling Error of Cephfs Shell
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-09-05 09:41:23 -07:00
Kefu Chai
3f2fd87036
Merge pull request #23930 from tchaikov/wip-include-cleanup
...
common,mon: add implicit `#include` headers
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-05 23:47:32 +08:00
Sage Weil
f8d728620f
Merge pull request #23909 from theanalyst/doc/releases/12.2.8
...
doc: release notes for 12.2.8 luminous
2018-09-05 10:43:26 -05:00
Abhishek Lekshmanan
5b5dbe257b
doc: release notes for 12.2.8 luminous
...
- Add a special note for upgrades from earlier releases
- Add a notable section mentioning the scrub and rgw options
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2018-09-05 16:38:45 +02:00
Kefu Chai
e29eb03521
Merge pull request #23852 from tchaikov/wip-cmake-cleanup
...
cmake: link compressor plugins against lib the modern way
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-09-05 22:28:37 +08:00
Casey Bodley
79d6b60302
Merge pull request #23925 from cfanz/wip-fix-data-sync-report
...
rgw-admin: fix data sync report for master zone
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-09-05 10:20:22 -04:00
Casey Bodley
15a0f1ec33
Merge pull request #23626 from Liuchang0812/rgw-put-cors-compatible
...
rgw: return err_malformed_xml when MaxAgeSeconds is an invalid integer
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-09-05 09:20:18 -04:00
Jason Dillaman
f98cbb1be7
Merge pull request #23835 from Songweibin/wip-import-34536
...
rbd: fix error import when the input is a pipe
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-05 09:15:34 -04:00
Jason Dillaman
86aa451b96
Merge pull request #23815 from shun-s/fix-acquire-lock-latency
...
librbd: fix possible unnecessary latency when requeue request
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-05 09:14:59 -04:00
Ricardo Marques
ee3e9622cd
Merge pull request #23935 from LenzGr/bug-35686-missing-tooltip
...
mgr/dashboard: Added missing tooltip to settings icon
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-09-05 13:59:53 +01:00
Lenz Grimmer
2c1f8b69f5
Merge pull request #23409 from ricardoasmarques/wip-role-management
...
mgr/dashboard: Role management from the UI
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-09-05 14:57:17 +02:00
Mykola Golub
bfaea4e76a
Merge pull request #23938 from dillaman/wip-qa-rbd-mkpool
...
qa/workunits/rbd: replace usage of 'rados mkpool'
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-09-05 15:42:38 +03:00
Jason Dillaman
0f0176ed4a
qa/workunits/rbd: replace usage of 'rados mkpool'
...
This command was dropped under commit 2c26fb0fe1
, so use
'ceph osd pool create' instead.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-05 08:17:39 -04:00
Ricardo Marques
5d2b0eb685
mgr/dashboard: Role management from the UI
...
Fixes: https://tracker.ceph.com/issues/24447
Signed-off-by: Ricardo Marques <rimarques@suse.com>
2018-09-05 13:12:20 +01:00
Kefu Chai
7d8a753e5d
Merge pull request #23937 from tchaikov/wip-crimson-test-denc
...
test/crimson: do not use unit.cc as the driver of unittest_seastar_denc
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-09-05 20:11:02 +08:00
Kefu Chai
b7852ff594
test/crimson: do not use unit.cc as the driver of unittest_seastar_denc
...
as unit.cc initializes the CephContext and all of Ceph's infratructure,
which is not necessary for the denc test. also, seastar's builtin allocator
only pre-allocates 32 << 20 bytes. it's enough for the denc test, but
not necessarily enough for create CephContext and its friends. an option is
to use seastar's app template to initialize the memory allocator properly.
another option is to avoid initializing CephContext in this test.
the latter is simpler.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-05 19:31:49 +08:00
Lenz Grimmer
7a27d62e9e
mgr/dashboard: Added missing tooltip to settings icon
...
Fixes: https://tracker.ceph.com/issues/35686
Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
2018-09-05 12:12:53 +02:00
Lenz Grimmer
fd593fde3d
Merge pull request #23797 from votdev/fix_user_notifications
...
mgr/dashboard: Fix notifications in user list and form
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2018-09-05 10:46:18 +02:00
Kefu Chai
9d40f41199
mon/MonClient.h: include necessary header
...
MonClient references LockPolicy, so it should include
common/lock_policy.h .
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-05 15:53:31 +08:00
Kefu Chai
710e2a577c
common/TrackedOp.h: include spinlock.h as this header uses it
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-05 15:53:31 +08:00
Kefu Chai
e2f966a800
common,crush,mds,messages,osd: add missing #include
...
they rely on dout.h to do this, but they should not.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-09-05 15:53:31 +08:00
Kefu Chai
b7b3ce87eb
Merge pull request #23816 from cyx1231st/wip-seastar-msgr-fix
...
crimson/net: miscellaneous fixes to seastar-msgr
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-09-05 15:45:28 +08:00
Volker Theile
7dc2b0c166
mgr/dashboard: Fix notifications in user list
...
The notification message title and text were inverted.
Signed-off-by: Volker Theile <vtheile@suse.com>
2018-09-05 09:23:21 +02:00
Kefu Chai
e292369201
Merge pull request #23912 from tchaikov/wip-install-deps-openldap
...
install-deps: s/openldap-client/openldap24-client/
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2018-09-05 14:03:14 +08:00
Gangbiao Liu
8baf1a219d
doc: Document correction
...
"doc/ceph-volume/lvm/prepare.rst": Remove duplicated words
"doc/radosgw/cloud-sync-module.rst": Remove duplicated words
Signed-off-by: Gangbiao Liu <liugangbiao@cmss.chinamobile.com>
2018-09-05 11:05:18 +08:00
cfanz
6e3be2461b
rgw-admin: fix data sync report for master zone
...
Signed-off-by: cfanz <songxinying@sensetime.com>
2018-09-05 10:57:35 +08:00
Xie Xingguo
ae9d1f1a1c
Merge pull request #23918 from dzafman/wip-fix-assert
...
osd: Change assert() to ceph_assert() missed in the transition
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-05 08:51:06 +08:00