Ken Dreyer
c5b00be0e7
Merge pull request #8034 from SUSE/wip-15047
...
packaging: make infernalis -> jewel upgrade work
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-03-11 16:58:35 -07:00
Nathan Cutler
a230a3839d
debian: make infernalis -> jewel upgrade work
...
Attempts to install jewel ceph-common, ceph-mon, ceph-osd, and ceph-base
package over infernalis ceph package fail due to files existing in both.
See comment #4 in the tracker issue for a deeper analysis.
http://tracker.ceph.com/issues/15047 Fixes : #15047
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-12 00:22:07 +01:00
Sage Weil
b96cfda4a3
Merge pull request #8045 from tchaikov/wip-scrubstore-cleanup
...
osd/ScrubStore: remove unused function
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:50:43 -05:00
Sage Weil
56fe749e2c
Merge pull request #7707 from xiexingguo/xxg-wip-14815
...
osd: filestore: fix wrong scope of result code for error cases during mount
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:33:13 -05:00
Sage Weil
4adeb410bf
Merge pull request #7726 from tchaikov/wip-fix-ftbfs-gcc6
...
test/time: no need to abs(uint64_t) for comparing
Reviewed-by: Adam Emerson <aemerson@redhat.com>
2016-03-11 10:32:38 -05:00
Sage Weil
07c41fcd49
Merge pull request #7955 from ErwanAliasr1/evelu-check-bufferlist
...
test/bufferlist: Avoid false-positive tests
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:32:05 -05:00
Sage Weil
a1490dc1bc
Merge pull request #7980 from liewegas/wip-14952
...
mon: initialize last_* timestamps on new pgs to creation time
Reviewed-by: John Spray <john.spray@redhat.com>
2016-03-11 10:31:34 -05:00
Sage Weil
5d745b2bee
Merge pull request #7982 from liewegas/wip-14606
...
qa/workunits/rest/test.py: add confirmation to 'mds setmap'
2016-03-11 10:30:53 -05:00
Sage Weil
4ab0fc51d1
Merge pull request #7983 from liewegas/wip-14616
...
log: do not repeat errors to stderr
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 10:29:55 -05:00
Sage Weil
c9124548e4
Merge pull request #8004 from liewegas/wip-rados-test-stderr
...
qa/workunits/rados/test.sh: capture stderr too
2016-03-11 10:29:39 -05:00
Sage Weil
243a36b37e
Merge pull request #8006 from liewegas/wip-big-pages
...
os/bluestore/KernelDevice: force block size
2016-03-11 10:29:00 -05:00
Sage Weil
134466532d
Merge pull request #8019 from kmroz/wip-upstream-civetweb-low-ports-6
...
rgw: drop permissions of rgw/civetweb after startup
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-11 10:28:17 -05:00
Kefu Chai
eb1c5feb9a
Merge pull request #8007 from wido/se-mirror-mail
...
mirrors: Change contact e-mail address for se.ceph.com
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 22:39:59 +08:00
Kefu Chai
f0c512b021
Merge pull request #7991 from xiexingguo/xxg-wip-remove-upthrupending
...
osd: remove up_thru_pending field, which is never used
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 22:39:29 +08:00
Kefu Chai
9e86b53906
Merge pull request #8023 from roidayan/xio-remove_unused_variable
...
xio: remove unused variable
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-11 22:15:54 +08:00
Josh Durgin
164de7aa39
Merge pull request #7923 from RustShen/master
...
doc: add cinder backend section to rbd-openstack.rst
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-11 00:04:44 -08:00
Kefu Chai
439991a438
osd/ScrubStore: remove unused function
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-11 15:52:25 +08:00
Dan Mick
81d7b0d338
Merge pull request #7999 from liewegas/wip-armhf
...
a few armhf (32-bit build) fixes
Reviewed-by: Dan Mick <dmick@redhat.com>
2016-03-10 19:15:59 -08:00
Yehuda Sadeh
e730a9846e
Merge pull request #7891 from rzarzynski/wip-rgw-content-disp
...
rgw: multiple Swift API compliance improvements for TempURL (Radoslaw Zarzynsk)
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-10 15:41:27 -08:00
Yehuda Sadeh
2ea72c1d5a
Merge pull request #7990 from x11562/rgw_unused_vector
...
rgw: remove unused vector
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-10 14:57:06 -08:00
Yehuda Sadeh
e6ecc65e2c
Merge pull request #8031 from ceph/wip-rgw-usage
...
rgw: admin api for retrieving usage info (Ji Chen)
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-10 14:53:15 -08:00
Yehuda Sadeh
356aaf2626
Merge pull request #8036 from yehudasa/wip-rgw-support-json-format-v2
...
rgw: support json format for admin policy API (Dunrong Huang)
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-10 14:50:21 -08:00
Yehuda Sadeh
adccab0154
Merge pull request #7874 from badone/wip-coverity-rgw_lib-uninit
...
[rgw] RGWLib::env is not used so remove it
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-10 14:26:30 -08:00
Yehuda Sadeh
b988f79b46
rgw_admin: policy dump --xml backward compatibility
...
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-10 14:22:19 -08:00
Dunrong Huang
3a8b0e3d1f
rgw: remove unused header file
...
Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
2016-03-10 13:35:28 -08:00
Dunrong Huang
dd24f51758
rgw: support json format output for rados-admin policy command
...
when use rados-admin to get policy with parameter --format=json:
$ radosgw-admin policy --bucket=m8x --format=json
policy information with json format should be output.
Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
2016-03-10 13:35:28 -08:00
Dunrong Huang
a1333f547e
rgw: support json format for admin policy API
...
Fixes : #14090 , #14091
- before this patch:
$ curl -s -X GET http://radosrgw:9090/admin/bucket?format=json&policy&bucket=m8x | xmllint --format -
got XML response with error format
- after this patch:
got correct response with json format
Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
2016-03-10 13:35:28 -08:00
Gregory Farnum
740c52d656
Merge pull request #8027 from liewegas/wip-reweight-fix
...
test/pybind/test_ceph_argparse: fix reweight-by-utilization tests
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-10 13:03:32 -08:00
Yehuda Sadeh
461bd7fa08
Merge pull request #6656 from jmunhoz/wip-bucket-request-payment-usage-log
...
rgw: add bucket request payment feature usage statistics integration
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-10 11:13:24 -08:00
Sage Weil
c812bbae47
Merge pull request #8021 from branch-predictor/bp-bench-full-bw
...
common/obj_bencher.cc: bump the precision of bandwidth field
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-10 13:08:54 -05:00
Matt Benjamin
70d3e1306f
Merge pull request #7675 from vmcloud/wip-12917
...
rgw: adjust the request_uri to support absoluteURI of http request
2016-03-10 12:03:49 -05:00
Sage Weil
d0f8713196
test/pybind/test_ceph_argparse: fix reweight-by-utilization tests
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-10 11:13:43 -05:00
Kefu Chai
797f1d41d9
man/8/ceph.rst: remove invalid option for reweight-by-*
...
--yes-i-really-mean-it is not valid option for reweight-by-*
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-10 11:13:42 -05:00
Sage Weil
d9ac0474b8
log: do not repeat errors to stderr
...
If we get an error writing to the log, log it only once to stderr.
This avoids generating, say, 72 GB of ENOSPC errors in
teuthology.log when /var/log fills up.
Fixes : #14616
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-10 09:50:07 -05:00
Kefu Chai
76b1450730
Merge pull request #8025 from roidayan/xio-remove_duplicate_peer_addr_assignment
...
xio: remove duplicate assignment of peer addr
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-10 21:52:36 +08:00
Roi Dayan
d1627f5d01
xio: remove duplicate assignment of peer addr
...
Signed-off-by: Roi Dayan <roid@mellanox.com>
2016-03-10 15:33:32 +02:00
Jason Dillaman
9cf46b84a8
test: correct journal test failure caused by two merged commits
...
Commit 21d9595
changed the journal width to 3 objects while commit
a00eae0
changed the signature of the journal create helper.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-10 07:58:31 -05:00
Roi Dayan
8affb392ee
xio: remove unused variable
...
Signed-off-by: Roi Dayan <roid@mellanox.com>
2016-03-10 14:31:54 +02:00
Piotr Dałek
7a461a43ad
common/obj_bencher.cc: bump the precision of bandwidth field
...
When calculated final average bandwidth exceeds 999MB, it starts
to get printed in scientific notation. Bump up the bandwidth
field precision so it'll remain in floating-point format for
a bit longer.
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2016-03-10 12:50:47 +01:00
Greg Farnum
c49de8c1c2
Merge remote-tracking branch 'origin/jewel'
...
Conflicts:
src/client/Client.h
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-03-10 00:56:37 -08:00
Gregory Farnum
dedcbc6bc2
Merge pull request #7495 from ukernel/jewel-10436
...
client: flush kernel pagecache before creating snapshot
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-10 00:52:17 -08:00
Karol Mroz
e3d8d65f16
rgw: instruct civetweb to drop permissions
...
Get uid set in g_ceph_context and pass to civetweb where setuid()/setgid()
will be invoked. This Allows for starting civetweb under privileged port
numbers.
Fixes : #13600
Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01:00
Karol Mroz
422c749b84
rgw_main: break up frontend config parsing
...
Before invoking global_init(), determine which frontends are configured.
If Civetweb is to be used, ensure it will be responsible for dropping
permissions after radosgw startup.
Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01:00
Karol Mroz
f50c332bcb
global_init: add run_pre_init argument to function signature
...
Allows running the global_pre_init() separately in order to parse config
options prior to invoking global_init().
Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01:00
Karol Mroz
c218c53d1a
global: record target user and group strings
...
Useful so we don't have to do a reverse lookup when dropping permissions
in civetweb.
Signed-off-by: Karol Mroz <kmroz@suse.com>
2016-03-10 09:33:16 +01:00
Gregory Farnum
44f7b87263
Merge pull request #7798 from ukernel/wip-mds-snap
...
A few more snapshot fixes, mostly around snapshotted inode/dentry tracking
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-09 22:49:46 -08:00
Gregory Farnum
d783e96775
Merge pull request #7994 from ukernel/jewel-14996
...
Merge: Fix client handling of "lost" open directories on shutdown
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-09 22:43:04 -08:00
RustShen
5fe3ff3f09
Modifications to rbd-openstack.rst
...
Original configuration is not working
'enabled_backends' should be changed accordingly
Signed-off-by: RustShen <rustinpeace@163.com>
Update rbd-openstack.rst
2016-03-10 14:31:34 +08:00
Greg Farnum
9f69cb1a81
Merge remote-tracking branch 'origin/greg-fs-testing-3-7-damage'
2016-03-09 22:25:25 -08:00
Gregory Farnum
eaded2ea4c
Merge pull request #7686 from david-z/wip-fix-fh-ref-leak
...
ceph-fuse: Fix potential filehandle ref leak at umount
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-09 22:25:42 -08:00