Sage Weil [Sat, 27 Jul 2019 12:59:30 +0000 (07:59 -0500)]
Merge PR #29316 into master
* refs/pull/29316/head:
common,tools: make sure the destination buffer can handle the size of the string
src/tools: initialize variables before the goto statement
src/mount: check before dereference buf
src/crush: check before dereference out2
src/test: s/strcpy/strncpy
Patrick Donnelly [Fri, 26 Jul 2019 22:18:13 +0000 (15:18 -0700)]
Merge PR #28685 into master
* refs/pull/28685/head:
client: more precise CEPH_CLIENT_CAPS_PENDING_CAPSNAP
client: unify kicking cap flushes and kicking snapcap flushes
client: define helper function that sends flushsnap message
client: cleanup tracking of early kicked flushing caps
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 26 Jul 2019 22:15:19 +0000 (15:15 -0700)]
Merge PR #28793 into master
* refs/pull/28793/head:
qa/cephfs: make run_shell() accept args as str too
qa/vstart_runner.py: ignores when source and destination are same
test_cephfs_shell: add a test for cd with arguments
test_cephfs_shell: add a test for cd with no arguments
test_cephfs_shell: group test methods
test_cephfs_shell: add a new method to return script output
test_cephfs_shell: allow running CephFS shell script
cephfs-shell: cd with no args shouldn't print an error message
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Fri, 26 Jul 2019 15:17:22 +0000 (10:17 -0500)]
mgr/telemetry: salt osd ids too
Better to fully obfuscate here.
This has a nice side-effect of assigning entity names that are *globally*
unique across the full telemetry data set, since the salts are unique and
sha1 is (sufficiently) collision-free.
common,tools: make sure the destination buffer can handle the size of the string
fix klocwork issues:
Width is not specified for 's' conversion specifier.
This can result in an overflow of the buffer
provided in argument 3 of a call to 'sscanf'
src/tools: initialize variables before the goto statement
CID 172143 (#15 of 15): Branch past initialization (PW.BRANCH_PAST_INITIALIZATION)
1. branch_past_initialization:
2. name_at_decl_position: variable "oid" (declared at line 220)
3. name_at_decl_position: variable "exkeys" (declared at line 241)
4. name_at_decl_position: variable "exvals" (declared at line 242)
5. name_at_decl_position: variable "safe" (declared at line 278)
Sage Weil [Fri, 26 Jul 2019 01:15:17 +0000 (20:15 -0500)]
Merge PR #28847 into master
* refs/pull/28847/head:
doc/mgr/telemetry: update
mgr/telemetry: move contact info to an 'ident' channel
mgr/telemetry: accept channel list to 'telemetry show'
mgr/telemetry: always generate new report for 'telemetry show'
mgr/telemetry: add 'device' channel and call out to devicehealth module
mgr/telemetry: add telemetry channel 'device'
mgr/telemetry: add separate channels
Sage Weil [Fri, 26 Jul 2019 01:14:46 +0000 (20:14 -0500)]
Merge PR #29221 into master
* refs/pull/29221/head:
mon/OSDMonitor: do not clobber pending xinfo during boot
osd/OSDMap: add is_dead() helper
mon/OSDMonitor: 'osd down ... --definitely-dead'
osd: send MOSDMarkMeDead when we are marked down
mon/OSDMonitor: implement MOSDMarkMeDead handling
mon/OSDMonitor: set dead_epoch for immediate failure (ECONNREFUSED)
osd/OSDMap: add dead_epoch to xinfo
Sage Weil [Tue, 9 Jul 2019 18:54:33 +0000 (13:54 -0500)]
mon/OSDMonitor: do not clobber pending xinfo during boot
If we have a pending xinfo change and also process a boot message, we
should not throw out the pending xinfo change.
This triggers when you mark an osd down and it sends both a MOSDMarkMeDead
and a new MOSDBoot message in quick succession: the first message sets
dead_epoch but the boot message processing clobbers it.
Jason Dillaman [Thu, 25 Jul 2019 16:36:19 +0000 (12:36 -0400)]
pybind/mgr: handle duplicate rbd task commands
The 'ceph' CLI will duplicate commands within teuthology to test
the MONs idempotency. This shouldn't be required for the MGR module,
but we can keep a fixed set of completed tests to handle this
possible command replay.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This callback can be used to track progress and also to attempt to cancel
the operation while it's in-progress by returning a negative error code
from the callback.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Rishabh Dave [Tue, 9 Jul 2019 11:42:01 +0000 (17:12 +0530)]
qa/vstart_runner.py: ignores when source and destination are same
put_file() in vstart_runner.py should ignore the error when source and
destination paths supplied are same, since source and destination for
put_file() method in teuthology are on different machines, they
represent different locations.
Rishabh Dave [Tue, 16 Jul 2019 10:17:18 +0000 (15:47 +0530)]
test_cephfs_shell: group test methods
Move tests into different classes created on the basis of a shell
functionality within the testsuite. This arrangement allows running
tests related to only one functionality at a time.
mgr: check for unicode passed to "set_health_checks()"
in python2, in addition to `str`, a string could also be unicode
string. there is chance that user passes a unicode string to
`set_health_checks()`, so let's check for unicode string also.
in python3, all strings are `unicode` string, and `PyString_Check()` is
defined as an alias of `PyUnicode_Check()`, so we are fine with python3.
the wrapper method of `PyString_ToString()` returns a pair of converted
string and a bool. if it fails to detect a string, an empty string and
false are returned.
dep-report.sh depends on .Po and .Plo files under .deps/, which is
created by automake. but we've switched to CMake. so we cannot use
these depfile or temporary depfiles anymore.
Sage Weil [Wed, 24 Jul 2019 22:20:21 +0000 (17:20 -0500)]
Merge PR #29034 into master
* refs/pull/29034/head:
doc/mgr/crash: document missing commands, options
qa/suites/rados/singleton/all/test-crash: whitelist RECENT_CRASH
qa/suites/rados/mgr/tasks/insights: whitelist RECENT_CRASH
qa/tasks/mgr/test_insights: crash module now rejects bad crash reports
mgr/telemetry: fix remote into crash do_ls()
mgr/crash: don't make these methods static
mgr/BaseMgrModule: handle unicode health detail strings
mgr/crash: verify timestamp is valid
qa/suites/mgr: whitelist RECENT_CRASH
mgr/crash: remove unused var
mgr/crash: remove unused import 'six'
qa/workunits/rados/test_crash: health check
mgr/crash: improve validation on post
mgr/crash: automatically prune old crashes after a year
mgr/crash: raise RECENT_CRASH warning for recent (new) crashes
mgr/crash: add 'crash ls-new'
mgr/crash: add option and serve infra
mgr/crash: keep copy of crashes in memory
mgr/pg_autoscaler: adjust style to match built-in tables
mgr/crash: make 'crash ls' a nice table with a NEW column
mgr/crash: nicely format 'crash info' output
mgr/crash: add 'crash archive <id>', 'crash archive-all' commands
Sage Weil [Wed, 24 Jul 2019 14:31:49 +0000 (09:31 -0500)]
Merge PR #29180 into master
* refs/pull/29180/head:
mon/FSCommand: set pg_num_min via 'fs new', not in mgr/volumes
mon/FSCommands: set pg_autoscale_factor on 'fs new', not via mgr/volumes
mon: set recovery_priority=5 on fs metadata pool
Reviewed-by: Neha Ojha <nojha@redhat.com> Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>