Commit Graph

98470 Commits

Author SHA1 Message Date
Samuel Just
0c254023cf dout: let <= 20 correspond to debug for crimson
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
5c76f63078 vstart: add --redirect-output option to redirect output for --nodaemon
Useful for crimson which doesn't currently support writing directly
to a log file.

Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
e799b38aed crimson/osd: use configured ceph-osd uuid in mkfs
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
d0dbb36e2e crimson/net/Connection: add peer_is_* helpers
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
212593dac5 crimson/net/SocketMessenger: wait for accepter thread to die on shutdown
Otherwise, it ends up trying to operator<< *this after it's been
deleted.

Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
d07592eab7 crimson/mon/MonClient: handle mon client connection race
The first to establish a connection and close the others needs
to ensure that the others don't mess with broken state.  To that
end, leave a cleared pending_conns map while the conns are being
closed.  Also, take care to clean up outstanding promises and
fallout from conns disappearing.

Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
c839c2d42b crimson/os/cyan_store: run t.get_on_* contexts
PeeringState makes liberal use of those callbacks, run them
upon completion of do_transaction.

Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
382a649fa0 crimson/os/cyan_store: add some omap machinery
Adds transaction methods for PeeringState.

Mainly omap_set, but also a stub for collection hint and the other omap
update methods.  Also adds omap_get and debugging to dump the
transaction upon encountering a problem.

Also fixes up std and ceph::bufferlist namespace qualifications.

Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
201dd35656 os/cyan_collection: add pragma once
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:05:44 -07:00
Samuel Just
b6e40a32cb osd/: move pg/osd state machinery into osd_types for use in crimson
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:04:32 -07:00
Samuel Just
fdd38eabd6 PGLog: add cyan_store machinery for reading the log
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-31 14:04:28 -07:00
Samuel Just
a90f2671ba PeeringState: permit init_from_disk_state to return a value
This way it can return a future.

Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-30 10:53:42 -07:00
Samuel Just
72a287bac0 PGPeeringEvent: move MLogRec constructor definition to .cc and add unique_ptr
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-30 10:53:42 -07:00
Samuel Just
b3d1215847 src/osd/: add appropriate OSDMapRef defs for seastar to OSDMap,osd_types
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-30 10:53:42 -07:00
Samuel Just
4320ed5ace PeeringState: modernize accept_buffered_messages
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-30 10:53:42 -07:00
Samuel Just
3e776b524b osd/: Move PeeringCtx out of PeeringState to permit forward declaration
Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-30 10:53:42 -07:00
Samuel Just
33528143e9 crimson/os: Move CollectionRef out of CyanStore
This way, we don't need cyan_store.h to get CollectionRef

Signed-off-by: Samuel Just <sjust@redhat.com>
2019-05-30 10:53:42 -07:00
Sage Weil
c47b322bd3 Merge PR #27957 into master
* refs/pull/27957/head:
	json: JSONDecoder::err inherits from std::runtime_error
	rgw: RGWXMLDecoder::err inherits from std::runtime_error

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2019-05-30 12:26:17 -05:00
Kefu Chai
3cf14fcbe0
Merge pull request #28317 from tchaikov/wip-crimson-net-remove-redundant-move
crimson/net: remove redundant std::move()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2019-05-31 01:16:26 +08:00
Kefu Chai
dea8e41930
Merge pull request #28289 from tchaikov/wip-kill-gcc-9-warnings
common,os: address string truncated warnings from GCC-9

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-05-30 23:56:41 +08:00
Kefu Chai
2953788f2a
Merge pull request #28055 from SUSE/wip-fix-39662
mgr/PyModuleRegistry: log error if we can't find any modules to load

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-05-30 23:56:02 +08:00
Kefu Chai
b300d60ffb crimson/net: remove redundant std::move()
see https://en.cppreference.com/w/cpp/language/copy_elision

it also silences warning like:

src/crimson/net/ProtocolV2.cc:146:26: warning: redundant move in return
statement [-Wredundant-move]
  146 |       return std::move(bl);
      |                          ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-05-30 22:06:46 +08:00
Kefu Chai
f6b022bdbe
Merge pull request #27806 from ashitakasam/add-osd-alarm
osd: Better error message when OSD count is less than osd_pool_default_size

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-05-30 21:28:54 +08:00
Kefu Chai
b2019a164b
Merge pull request #28278 from tchaikov/wip-buffer-remove-advance-size_t
buffer.h: remove list::iterator_impl::advance(size_t)

Reviewed-by: James Page <james.page@ubuntu.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-05-30 21:26:27 +08:00
Kefu Chai
cca664e795
Merge pull request #28251 from xiexingguo/wip-balancer-new-osd-weight
mgr/balancer: fix initial weight-set value for newly created osds

Reviewed-by: Sage Weil <sage@redhat.com>
2019-05-30 21:23:44 +08:00
Kefu Chai
8b1e713254
Merge pull request #28107 from ifed01/wip-ifed-add-devices
os/bluestore: show device name in "osd metadata output"

Reviewed-by: Sage Weil <sage@redhat.com>
2019-05-30 21:20:15 +08:00
Kefu Chai
7a0d0f7285
Merge pull request #28277 from javacruft/32bit-compat-fixes
common: avoid use of size_t in options

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-05-30 21:18:43 +08:00
Jason Dillaman
d760291c2a
Merge pull request #28250 from tchaikov/wip-silence-warnings
mon,test: silence warnings from GCC and test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-05-30 07:42:05 -04:00
Kefu Chai
68c64e59c7
Merge pull request #25729 from the78mole/wip-32-bit-arm-fixes
cmake: boost fixes for ARM 32 bit

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-05-30 12:50:45 +08:00
Kefu Chai
10683cce90
Merge pull request #28255 from tchaikov/wip-convenience
common: no need to include ceph_assert.h

Reviewed-by: Sage Weil <sage@redhat.com>
2019-05-30 11:24:00 +08:00
Kefu Chai
5defdb9238
Merge pull request #28270 from NTmatter/patch-2
blobhash.h: remove extra [[fallthrough]]

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-05-30 11:22:18 +08:00
Sage Weil
5686d1ccd5 Merge PR #27799 into master
* refs/pull/27799/head:
	common/utime: don't pass %z to utime if there is a 'Z'
	test: test json encode/decode of utime_t
	mgr/ssh: parse new datetime
	mgr/devicehealth: parse new datetime
	mgr/crash: parse both old and new timestamp formats
	mgr/telemetry: use cluster-provided timestamp unmolested
	mon/MonMap: dump timestamps in UTC
	qa/tasks/ceph: tolerate 'T' or ' ' as date and time separator
	PendingReleaseNotes: note about change to ISO 8601 throughout
	test/cli: update regexs for timestamps
	log/LogClock: render timestamp in ISO 8601 format
	common/ceph_time: stringify in ISO 8601 format
	unittest_utime: add tests
	common/utime: make parse() handle (our) ISO 8601 output
	include/utime: make default string rendering ISO 8601 conformant
	include/utime: remove unused s[n]printf methods
	include/utime: make gmtime() output conformant ISO 8601

Reviewed-by: Kanika Murarka <kmurarka@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2019-05-29 15:27:52 -05:00
Sage Weil
1d1c4782ee common/utime: don't pass %z to utime if there is a 'Z'
This fails on centos 7 for some reason.

If it's UTC, we don't need to parse the tz portion, so avoid the issue by
leaving the %z out of the fmt string.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Casey Bodley
e24cd6bf3e test: test json encode/decode of utime_t
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
631ac85615 mgr/ssh: parse new datetime
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
b7e91923dc mgr/devicehealth: parse new datetime
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
8b02318f6b mgr/crash: parse both old and new timestamp formats
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
383006a5cc mgr/telemetry: use cluster-provided timestamp unmolested
The cluster stamp is now ISO 8601; just use that.

(The isoformat() puts a : in +hh:mm the timezone offset, which is slightly
different than what Ceph does; just pass Ceph's value through for
consistency.)

Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
7eb971e93c mon/MonMap: dump timestamps in UTC
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
b747ae1711 qa/tasks/ceph: tolerate 'T' or ' ' as date and time separator
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
1f73631e75 PendingReleaseNotes: note about change to ISO 8601 throughout
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:15 -05:00
Sage Weil
8891fb56d4 test/cli: update regexs for timestamps
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Sage Weil
8f4811c3cb log/LogClock: render timestamp in ISO 8601 format
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Sage Weil
5e37a73247 common/ceph_time: stringify in ISO 8601 format
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Sage Weil
81c988093c unittest_utime: add tests
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Sage Weil
668d6e7f97 common/utime: make parse() handle (our) ISO 8601 output
- optional subsecond values
- optional timezone offset

Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Sage Weil
79d8d761cf include/utime: make default string rendering ISO 8601 conformant
- use T separator
- include TZ offset

Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Sage Weil
6b2102be22 include/utime: remove unused s[n]printf methods
Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Sage Weil
ec3ddcb988 include/utime: make gmtime() output conformant ISO 8601
Use 'T' separated instead of ' '.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-05-29 14:12:01 -05:00
Yuri Weinstein
5111f6df16
Merge pull request #28271 from yuriw/wip-yuriw-crontab-master
qa/tests: removed filters for client-upgrade-* suites
2019-05-29 09:33:19 -07:00