]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Orit Wasserman [Thu, 4 May 2017 09:29:22 +0000 (12:29 +0300)]
Update rgw_rest.cc
fix indentation.
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Radoslaw Zarzynski [Mon, 24 Apr 2017 14:34:35 +0000 (16:34 +0200)]
rgw: Browser Upload's primitives take bool output params as references.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Fri, 2 Dec 2016 17:43:43 +0000 (18:43 +0100)]
rgw: FormPost returns 401 Unauthorized instead of 403 Forbidden.
This patch emerged because newer versions of Tempest became
more restrictive in the matter of FormPost's error handling.
Previously, Tempest was accepting both 403 Forbidden as well
as 401 Unauthorized as a response for signature mismatch or
expired form. Actually only the second one is acceptable for
tempest.api.object_storage.test_object_formpost_negative.*
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Fri, 4 Nov 2016 12:45:44 +0000 (13:45 +0100)]
rgw: fix error handling in RGWPostObj_ObjStore::read_with_boundary.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 19:48:11 +0000 (21:48 +0200)]
rgw: improve debug printing in browser upload of S3 and Swift.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 17:24:40 +0000 (19:24 +0200)]
rgw: Swift's FormPost does support per-file content types.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 13:53:55 +0000 (15:53 +0200)]
rgw: RGWFormPost does support Swift's max_file_size parameter.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 13:42:09 +0000 (15:42 +0200)]
rgw: enforce presence of at least one file to upload in RGWFormPost.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 12:27:49 +0000 (14:27 +0200)]
rgw: restrict the scope of RGWPostObj::data_pending.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 12:03:41 +0000 (14:03 +0200)]
rgw: add basic support for redirect in Swift's FormPost.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 11:39:25 +0000 (13:39 +0200)]
rgw: refactor the expiration checking in FormPost of Swift API.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 08:34:31 +0000 (10:34 +0200)]
rgw: implement form's signature verification in Swift's FormPost.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 21 Sep 2016 08:33:51 +0000 (10:33 +0200)]
rgw: add RGWPostObj_ObjStore::get_part_str method.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Tue, 20 Sep 2016 14:27:30 +0000 (16:27 +0200)]
rgw: remove unused RGWPostObj_ObjStore::post_form_part::content_type.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Tue, 20 Sep 2016 14:07:39 +0000 (16:07 +0200)]
rgw: strip the parts state from RGWPostObj_ObjStore.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Tue, 20 Sep 2016 13:31:03 +0000 (15:31 +0200)]
rgw: add support for form expiration in Swift's FormPost.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Mon, 19 Sep 2016 10:28:08 +0000 (12:28 +0200)]
rgw: add support for object prefixes in Swift's FormPost.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Sun, 18 Sep 2016 18:01:02 +0000 (20:01 +0200)]
rgw: add an early, initial implementation of the Swift's FormPost middleware.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Sun, 18 Sep 2016 17:59:25 +0000 (19:59 +0200)]
rgw: make parse_boundary_params() static method of RGWPostObj_ObjStore.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Sun, 18 Sep 2016 17:53:38 +0000 (19:53 +0200)]
rgw: clean-up the unnecessary RGWPostObj::boundary member.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Thu, 15 Sep 2016 12:45:31 +0000 (14:45 +0200)]
rgw: add RGWPostObj_ObjStore::get_params() to encapsulate boundary extraction.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Mon, 24 Apr 2017 15:09:01 +0000 (17:09 +0200)]
rgw: make the RGWPostObj_ObjStore::post_form_part public due to rgw_crypt.cc.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Thu, 15 Sep 2016 10:52:27 +0000 (12:52 +0200)]
rgw: accommodate the multipart-boundary parsing in RGWPostObj_ObjStore.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 14 Sep 2016 11:54:27 +0000 (13:54 +0200)]
rgw: ONLY move the parts of RGWPostObj_ObjStore_S3 to RGWPostObj_ObjStore.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Wed, 14 Sep 2016 11:25:53 +0000 (13:25 +0200)]
rgw: RGWPostObj is able now to handle multiple files in single form.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Radoslaw Zarzynski [Tue, 13 Sep 2016 15:28:12 +0000 (17:28 +0200)]
rgw: ignore fields placed after "file" in S3's browser uploads.
Fixes: http://tracker.ceph.com/issues/17273
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
John Spray [Mon, 24 Apr 2017 10:20:59 +0000 (11:20 +0100)]
Merge pull request #14575 from jcsp/wip-cephfs-suites
qa: Tidy up fs/ suite
Reviewed-by: Yan, Zheng <zyan@redhat.com>
John Spray [Sun, 16 Apr 2017 15:45:04 +0000 (16:45 +0100)]
qa: switch off btrfs for multimds and kcephfs
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Sun, 16 Apr 2017 16:05:32 +0000 (17:05 +0100)]
qa: update links for modified fs subsuite names
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Sat, 15 Apr 2017 14:14:37 +0000 (15:14 +0100)]
qa/tasks/cephfs: clean up mount point setup
Previously were sometimes trying to maintain a mounted
client across a filesystem destroy/create.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Sat, 15 Apr 2017 10:51:56 +0000 (11:51 +0100)]
qa/suites: don't use btrfs for cephfs testing
This change happened a while back, but it got rolled back
when the generic objectstore/ dir had its filestore
entry split out into xfs and btrfs in
208675af .
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Sat, 15 Apr 2017 10:47:15 +0000 (11:47 +0100)]
qa: remove unused fs/ dir
The objectstore/ dir is now selecting the backing fs.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Sat, 15 Apr 2017 10:31:41 +0000 (11:31 +0100)]
qa/suites/fs: more meaningful names for sub suites
The "recovery" sub suite was originally tests for
client/mds recovery in certain failure cases, it has
since grown to include lots of unit testing of
various features using CephFSTestCase.
The "basic" suite is now specifically just running workloads
now that I've moved out the smaller functional tests.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Sat, 15 Apr 2017 10:29:33 +0000 (11:29 +0100)]
qa/suites/fs: put simple functional tests together
Most of what's in basic/ is "workload" type testing
(i.e. a simple cluster cluster configuration and then
running a script inside the client), which gets
permuted in various ways. Move the simpler
functional tests out with the others like themselves.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Sat, 15 Apr 2017 10:28:10 +0000 (11:28 +0100)]
qa: don't permute object store for functional tests
These are unit tests for specific CephFS functionality,
it is gratuitous to repeat them with different underlying
RADOS object stores.
We retain coverage of XFS vs. bluestore in the workload tests.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 24 Apr 2017 10:12:26 +0000 (11:12 +0100)]
Merge pull request #14018 from jcsp/wip-17939
client: getattr before returning quota/layout xattrs
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Brad Hubbard [Mon, 24 Apr 2017 05:01:41 +0000 (15:01 +1000)]
Merge pull request #14729 from joscollin/wip-cleanup-osdc-comparision
osdc: silence warning from `-Wsign-compare`
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 24 Apr 2017 04:20:42 +0000 (12:20 +0800)]
Merge pull request #14711 from jcsp/wip-19738
mon: don't call propose_pending in prepare_update()
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 24 Apr 2017 04:02:28 +0000 (12:02 +0800)]
Merge pull request #14740 from petermaloney/master
doc: fix link that pointed to a nonexistent file
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jos Collin [Sat, 22 Apr 2017 08:19:20 +0000 (13:49 +0530)]
osdc: warning: comparison between signed and unsigned integer expressions
The following warning appears during make. Fixed the review comments too.
[ 28%] Building CXX object src/mds/CMakeFiles/mds.dir/__/osdc/Journaler.cc.o
./src/osdc/Journaler.cc: In member function ‘void Journaler::_do_flush(unsigned int)’:
./src/osdc/Journaler.cc:643:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (newlen < len) {
~~~~~~~^~~~~
Signed-off-by: Jos Collin <jcollin@redhat.com>
Brad Hubbard [Mon, 24 Apr 2017 01:49:10 +0000 (11:49 +1000)]
Merge pull request #14705 from joscollin/wip-googletest-warning
test: warning: comparison between signed and unsigned integer expressions
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Sage Weil [Sun, 23 Apr 2017 20:49:28 +0000 (15:49 -0500)]
Merge pull request #13898 from songbaisen/m5
osd: check fsid is normal before osd mkfs
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 23 Apr 2017 20:47:58 +0000 (15:47 -0500)]
Merge pull request #10893 from yonghengdexin735/wip-zzz-1
rados: check for negative return value of rados_create_with_context() as its comment put
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sun, 23 Apr 2017 20:47:28 +0000 (15:47 -0500)]
Merge pull request #14442 from liewegas/wip-midkraken-upgrade
mon/OSDMonitor: tolerate upgrade from post-kraken dev cluster
Reviewed-by: Kefu Chai <kchai@redhat.com>
Peter Maloney [Sun, 23 Apr 2017 18:33:03 +0000 (20:33 +0200)]
doc: fix link that pointed to a nonexistent file
commit
d788bae60dac374dcf5c7a30fca04426cbee660a renamed config.rst to config-fcgi.rst
Reported-by: fusl in #ceph on irc.oftc.net
Signed-off-by: Peter Maloney <peter.maloney@brockmann-consult.de>
Mykola Golub [Sun, 23 Apr 2017 16:32:43 +0000 (19:32 +0300)]
Merge pull request #14712 from dillaman/wip-rbd-mirror-watch
rbd-mirror: remove tracking of image names from pool watcher
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Orit Wasserman [Sun, 23 Apr 2017 16:09:57 +0000 (19:09 +0300)]
Merge pull request #14722 from cbodley/wip-19746
radosgw-admin: warn that 'realm rename' does not update other clusters
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Kefu Chai [Sun, 23 Apr 2017 14:40:40 +0000 (22:40 +0800)]
Merge pull request #14338 from aclamk/fix-fio-ceph-objectstore-lifetime
fio_ceph_objectstore: fixes improper write request data lifetime
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Casey Bodley [Sat, 22 Apr 2017 15:49:05 +0000 (11:49 -0400)]
Merge pull request #14335 from hrchu/radosgw-admin-api-subuser
doc: rgw: Clean up create subuser parameters
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Haomai Wang [Sat, 22 Apr 2017 03:46:48 +0000 (11:46 +0800)]
Merge pull request #14707 from wjwithagen/wip-wjw-freebsd-kqueue-logging
msg: Increase loglevels on some messages
Reviewed-by: Haomai Wang <haomai@xsky.com>
Sage Weil [Fri, 21 Apr 2017 23:54:25 +0000 (18:54 -0500)]
Merge pull request #9853 from dx9/wip-alpine-dev-support
alpine: add alpine linux dev support
Sage Weil [Fri, 21 Apr 2017 23:54:01 +0000 (18:54 -0500)]
Merge pull request #14189 from tchaikov/wip-mgr-py-stderr
mgr: redirect python stdout,stderr to ceph log
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Fri, 21 Apr 2017 23:53:17 +0000 (18:53 -0500)]
Merge pull request #14559 from liewegas/wip-pg-map
mon: move 'pg map' to OSDMonitor
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Apr 2017 23:53:02 +0000 (18:53 -0500)]
Merge pull request #14583 from joscollin/wip-cleanup-osdmap-sections
osd: renamed the new vector name in OSDMap::build_simple_crush_map_from_conf
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 21 Apr 2017 23:52:44 +0000 (18:52 -0500)]
Merge pull request #14721 from dmick/wip-crypto-arm
CMakeLists.txt: don't do crypto/isa-l if not Intel
Reviewed-by: Kefu Chai <kchai@redhat.com>
Marcus Watts [Fri, 21 Apr 2017 19:48:46 +0000 (15:48 -0400)]
Merge pull request #14501 from mdw-at-linuxbox/wip-rgw-rvk
rgw: swift: disable revocation thread if sleep == 0
Casey Bodley [Fri, 21 Apr 2017 19:04:48 +0000 (15:04 -0400)]
radosgw-admin: warn that 'realm rename' does not update other clusters
Fixes: http://tracker.ceph.com/issues/19746
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Dan Mick [Fri, 21 Apr 2017 18:18:27 +0000 (11:18 -0700)]
CMakeLists.txt: don't do crypto/isa-l if not Intel
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Sage Weil [Fri, 21 Apr 2017 18:18:01 +0000 (13:18 -0500)]
Merge pull request #14716 from tchaikov/wip-mgr-pystring-leak
mgr: release allocated PyString
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Fri, 21 Apr 2017 18:16:48 +0000 (13:16 -0500)]
Merge pull request #14720 from liewegas/wip-19591
mgr: fix session leak
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 12 Apr 2017 13:59:03 +0000 (09:59 -0400)]
vstart.sh: add --valgrind_args
To do leak checking, you can do
vstart.sh ... \
--valgrind_mgr memcheck \
--valgrind_args '--leak-check=full --show-reachable=yes'
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 12 Apr 2017 13:58:18 +0000 (09:58 -0400)]
mgr/MgrSession: allow ref tracing, and fix ref leak
The first RefCountedObj ctor arg is a cct, not a ref count.
Fixes: http://tracker.ceph.com/issues/19591
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 12 Apr 2017 13:35:03 +0000 (09:35 -0400)]
vstart.sh: add --valgrind_mgr
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 21 Apr 2017 17:23:41 +0000 (12:23 -0500)]
Merge pull request #12272 from kylinstorage/wip-writesame
osd: use append(bufferlist &) to avoid unnecessary copy
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Apr 2017 17:23:05 +0000 (12:23 -0500)]
Merge pull request #11684 from runsisi/wip-fix-asok-mode
common/admin_socket: add config for admin socket permission bits
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Apr 2017 17:22:51 +0000 (12:22 -0500)]
Merge pull request #13019 from wonzhq/wip-long-io
osd: support dumping long ops
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 21 Apr 2017 17:22:38 +0000 (12:22 -0500)]
Merge pull request #14358 from majianpeng/osd-remove-modsubop
osd/ReplicatedBackend: remove MOSDSubOp cruft from repop_applied
Reviewed-by: Sage Weil <sage@redhat.com>
Casey Bodley [Fri, 21 Apr 2017 15:17:14 +0000 (11:17 -0400)]
Merge pull request #14268 from hrchu/swift/java
doc: rgw: Rewrite Java swift examples
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Fri, 21 Apr 2017 15:08:27 +0000 (23:08 +0800)]
Merge pull request #10384 from wjwithagen/wip-wjw-reduce-noise
common/ceph_context.cc: Use CEPH_DEV to reduce logfile noise
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 21 Apr 2017 15:04:57 +0000 (23:04 +0800)]
Merge pull request #14693 from mogeb/init-ceph-libs
init-ceph: add ceph libraries path to environment
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 21 Apr 2017 15:00:07 +0000 (23:00 +0800)]
Merge pull request #12898 from XinzeChi/wip-interval-return
common/interval_set: return int64_t for size()
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 21 Apr 2017 14:57:44 +0000 (22:57 +0800)]
Merge pull request #14232 from jcsp/wip-19412
mgr: fix python module teardown & add tests
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 19 Apr 2017 14:16:40 +0000 (10:16 -0400)]
mon/OSDMonitor: cleanup: use range-based loop
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Apr 2017 18:17:29 +0000 (14:17 -0400)]
qa/tasks/ceph_manager: use 'pg map' for get_pg_{primary,replica}
Pulling this out of the 'pg dump' heap is inefficient.
Also, pg dump data comes from the mgr and may be stale.
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 21 Apr 2017 14:56:21 +0000 (22:56 +0800)]
Merge pull request #14584 from tchaikov/wip-19631
qa/suites: Revert "qa/suites: add mon-reweight-min-pgs-per-osd = 4"
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 21 Apr 2017 14:55:37 +0000 (22:55 +0800)]
Merge pull request #14504 from tchaikov/wip-another-mgr-command
mon,mgr: trim osdmap without the help of pgmap
Reviewed-by: Sage Weil <sage@redhat.com>
Casey Bodley [Fri, 21 Apr 2017 14:54:55 +0000 (10:54 -0400)]
Merge pull request #14055 from hrchu/radosgw-admin-api-user-caps
doc: correct and improve add user capability section
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Fri, 21 Apr 2017 14:52:28 +0000 (10:52 -0400)]
Merge pull request #13956 from hrchu/rgw-admin-doc
Indicate how to add multiple admin capbabilies
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Fri, 21 Apr 2017 14:50:55 +0000 (10:50 -0400)]
Merge pull request #14372 from hrchu/rgwadmin-admin-doc-usage
doc: rgw: correct get usage parameter default value
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Fri, 21 Apr 2017 14:36:18 +0000 (22:36 +0800)]
mgr: release allocated PyString
Signed-off-by: Kefu Chai <kchai@redhat.com>
Casey Bodley [Fri, 21 Apr 2017 14:26:19 +0000 (10:26 -0400)]
Merge pull request #14547 from smithfarm/wip-create-pool
rgw: cleanup: fix variable name in RGWRados::create_pool() declaration
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Fri, 21 Apr 2017 14:06:39 +0000 (09:06 -0500)]
Merge pull request #14697 from ceph/wip-rgw-upgrade-s3tests-encryption
qa/rgw: don't scan radosgw logs for encryption keys on jewel upgrade test
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 21 Apr 2017 13:39:43 +0000 (08:39 -0500)]
Merge pull request #14424 from dachary/wip-jerasure-sync
erasure-code: sync jerasure/gf-complete submodules
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Sage Weil [Fri, 21 Apr 2017 13:38:59 +0000 (08:38 -0500)]
Merge pull request #14558 from liewegas/wip-18293
osd: fix occasional MOSDMap leak
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Apr 2017 13:38:47 +0000 (08:38 -0500)]
Merge pull request #14633 from SUSE/wip-yasm-wrapper-strip-E-flag
yasm-wrapper: strip -E (stops ccache trashing source files)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Apr 2017 13:38:32 +0000 (08:38 -0500)]
Merge pull request #14640 from ovh/bp-fiemap-burden
osd, os: reduce fiemap burden
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 21 Apr 2017 13:37:46 +0000 (08:37 -0500)]
Merge pull request #14644 from liewegas/wip-rados-df-json
rados: out json 'df' values as numbers, not strings
Reviewed-by: David Zafman <dzafman@redhat.com>
Sage Weil [Fri, 21 Apr 2017 13:37:31 +0000 (08:37 -0500)]
Merge pull request #14645 from liewegas/wip-mgr-mon
mon/MgrMonitor: only propose if we updated
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Apr 2017 13:37:18 +0000 (08:37 -0500)]
Merge pull request #14648 from gregsfortytwo/wip-17916-master
osd: pglog: with config, don't assert in the presence of stale diverg…
Reviewed-by: Sage Weil <sage@redhat.com>
John Spray [Fri, 21 Apr 2017 10:42:29 +0000 (06:42 -0400)]
mon: don't call propose_pending in dispatch
This was happening indirectly because the command handling
code was calling tick() as a shortcut to "promote something"
and tick calls propose_pending because.
Fixes: http://tracker.ceph.com/issues/19738
Signed-off-by: John Spray <john.spray@redhat.com>
Willem Jan Withagen [Fri, 21 Apr 2017 08:04:51 +0000 (10:04 +0200)]
msg/async/EventKqueue.cc: set logging from Kqueue higher
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
Kefu Chai [Fri, 21 Apr 2017 04:50:18 +0000 (12:50 +0800)]
mgr: move handle_pyerror() from MgrPyModules to MgrPyModule
so we can reuse it in a more sane way.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Dan Mick [Wed, 12 Apr 2017 02:13:29 +0000 (19:13 -0700)]
mgr/MgrPyModule::handle_command: order stringstreams to match intent
ds is intended for command output (like stdout), to be shown/saved
when there's no error returned; ss is for error status (like stderr)
to further explain the error. mgr Python tracebacks should go to
the latter.
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Dan Mick [Tue, 11 Apr 2017 23:27:33 +0000 (16:27 -0700)]
mgr/PyModules handle_pyerror: don't add extra newlines to tb
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Dan Mick [Tue, 11 Apr 2017 22:31:08 +0000 (15:31 -0700)]
mgr/MgrPyModule.cc: get Python traceback in all CallMethod spots
Signed-off-by: Dan Mick <dan.mick@redhat.com>
Tim Serong [Fri, 24 Mar 2017 13:36:27 +0000 (14:36 +0100)]
mgr: log module name before PyErr_Print()
If an exception is raised in any of the python module functions
invoked by mgr (for example, ImportError if rest_framework isn't
available when serve() in called in the rest module), print the
module name along with the failed method name.
This commit also fixes what looks to me like a missed call to
PyGILState_Release() in the failure case in MgrPyModule::serve().
Signed-off-by: Tim Serong <tserong@suse.com>
Kefu Chai [Tue, 28 Mar 2017 10:49:01 +0000 (18:49 +0800)]
mgr: redirect python stdout,stderr to ceph log
PyErr_Print() uses a file object "stderr" for printing messages.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Jos Collin [Fri, 21 Apr 2017 06:07:41 +0000 (11:37 +0530)]
test: warning: comparison between signed and unsigned integer expressions
The following warning appears during make:
[ 61%] Building CXX object src/test/CMakeFiles/unittest_simple_spin.dir/simple_spin.cc.o
In file included from ./src/test/simple_spin.cc:1:0:
./src/googletest/googletest/include/gtest/gtest.h: In instantiation of ‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int]’:
./src/googletest/googletest/include/gtest/gtest.h:1421:23: required from ‘static testing::AssertionResult testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*, const char*, const T1&, const T2&) [with T1 = unsigned int; T2 = int; bool lhs_is_null_literal = false]’
./src/test/simple_spin.cc:49:3: required from here
./src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (lhs == rhs) {
~~~~^~~~~~
Signed-off-by: Jos Collin <jcollin@redhat.com>
Jason Dillaman [Fri, 21 Apr 2017 01:23:43 +0000 (21:23 -0400)]
rbd-mirror: remove image name retrieval from pool watcher
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 21 Apr 2017 01:00:34 +0000 (21:00 -0400)]
rbd-mirror: eliminate use of image name during bootstrap
Signed-off-by: Jason Dillaman <dillaman@redhat.com>