Yuri Weinstein
bf9df72899
Merge pull request #11547 from javeme/check-pgid
...
osd/command tell: check pgid at the right time
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-31 16:36:17 -07:00
Yuri Weinstein
79536a562c
Merge pull request #11203 from stiopaa1/osd_pg_replaceCountPart1
...
osd/PG.cc: prevent repeated searching of map/set
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-31 15:30:47 -07:00
Yuri Weinstein
2efa73f346
Merge pull request #11242 from stiopaa1/osd_replicatedpg_removeCount1
...
osd/ReplicatedPG: remove unneeded use of count
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-31 15:30:24 -07:00
Yuri Weinstein
a7dae73800
Merge pull request #11365 from badone/wip-lsb_release-remove
...
common: Remove the runtime dependency on lsb_release
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
2016-10-31 15:29:25 -07:00
Jason Dillaman
20406aef3e
test: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled
...
Fixes: http://tracker.ceph.com/issues/17750
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 16:18:56 -04:00
Nitin A Kamble
266f4d4f20
install-deps.sh: allow building on SLES systems
...
Avoids this error on SLES systems:
> ./install-deps.sh
sles is unknown, dependencies will have to be installed manually.
Signed-off-by: Nitin A Kamble <Nitin.Kamble@Teradata.com>
2016-10-31 11:48:22 -07:00
Yehuda Sadeh
e8f26c035b
rgw: json encode/decode index_type, allow modification
...
Fixes: http://tracker.ceph.com/issues/17755
We didn't dump the index_type field of RGWBucketInfo, also didn't
allow modifying it via metadata api.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-10-31 10:50:07 -07:00
Ken Dreyer
932a0e9862
doc: rm "type=rpm-md" from yum repositories
...
As far as I can tell, this is only relevant to SUSE's Zypper, and yum
does not need it.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-10-31 11:29:30 -06:00
Jason Dillaman
b8589691d7
librbd: unit test cases and minor fixes for mirror::DisableRequest
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
552acd3a07
cls/journal: use librados::IoCtx reference for helper state machines
...
This facilitates being able to properly mock test cases around journal
cls method calls.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
86a0c1e5e3
librbd: restore journal access when force disabling mirroring
...
If mirroring is force disabled on a demoted image, the journal was
being left in an inconsistent ownership state.
Fixes: http://tracker.ceph.com/issues/17588
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
3bc9f51c58
librbd: new async journal promote state machine
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
7187383291
librbd: new async journal open state machine
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
f59f0d4955
librbd: move journal tag decode helpers to shared location
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
06a84eef70
librbd: re-add support for disabling a corrupt journal
...
Fixes: http://tracker.ceph.com/issues/16740
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Sage Weil
f3f74ddb3d
make-dist: do not use make_version (and remove it)
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-31 10:10:47 -04:00
Sage Weil
dd6d3d920b
make-dist: do not generate ceph_ver.h
...
cmake does this on its own, and puts it in a different location (the build
dir).
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-31 10:10:47 -04:00
Sage Weil
aa188e3bed
src/CMakeLists.txt: remove leading 'v' from version string
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-31 10:10:46 -04:00
Sage Weil
70a061ff6b
Merge pull request #11249 from wido/osd-flush-journal-shutdown
...
osd: Flush Journal on shutdown
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-10-31 09:06:14 -05:00
Sage Weil
dab6c28446
Merge pull request #11686 from ceph/wip-ceph-rest-api-new-addr
...
ceph-rest-api: understand the new style entity_addr_t representation
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-31 09:05:22 -05:00
Sage Weil
abcb93cd27
Merge pull request #11530 from markhpc/wip-rocksdb_tuning
...
common/config_opts.h: Optimized RocksDB WAL settings.
2016-10-31 09:03:05 -05:00
weiqiaomiao
51a4405a1e
rgw: fix osd crashes when execute "radosgw-admin bi list --max-entries=1" command
...
Fixes: http://tracker.ceph.com/issues/17745
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-10-31 13:59:55 +08:00
Brad Hubbard
7a633e44e4
Merge pull request #11688 from stiopaa1/mds_snapserver_addConstToMemFun
...
mds/SnapServer: add const to member function
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2016-10-31 07:24:51 +10:00
Michal Jarzabek
2eb96d5718
mds/SnapServer: add const to member function
...
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-10-30 08:28:03 +00:00
Kefu Chai
f50086db55
ceph-rest-api: understand the new style entity_addr_t representation
...
the new entity_addr_t representation was introduced by 3561eb3
, we
should update ceph_rest_api.py accordingly.
Fixes: http://tracker.ceph.com/issues/17742
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-10-30 15:06:44 +08:00
Kefu Chai
ee5a43caf8
Merge pull request #10993 from Vicente-Cheng/fix-alloc-choose_tries
...
crush: make counting of choose_tries consistent
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-30 11:54:59 +08:00
Kefu Chai
a8f50e7e6b
Merge pull request #11246 from badone/wip-set_xattr_limits_via_conf-fix
...
os/filestore: Fix erroneous WARNING: max attr too small
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-30 11:54:16 +08:00
Kefu Chai
c28580be0d
Merge pull request #11614 from runsisi/wip-fix-PK11_FreeSymKey-segfault
...
auth: fix NULL pointer access when trying to delete CryptoAESKeyHandler instance
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-30 11:50:51 +08:00
Kefu Chai
134102127e
Merge pull request #11654 from hjwsm1989/fix
...
mon: print the num_pools and num_objects in 'ceph -s -f json/json-p…
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-30 11:49:49 +08:00
Kefu Chai
25d43f4d32
Merge pull request #11639 from atheism/mgr-PyModules-remove-duplicated-else-if
...
mgr: PyModules.cc: remove duplicated if condition for fs_map
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-30 11:48:51 +08:00
Kefu Chai
9ae1fe88ff
Merge pull request #11659 from tchaikov/wip-delete-cct-later
...
librados: postpone cct deletion
Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-30 11:47:06 +08:00
zhang.zezhu
8ac02e9a29
src/common/perf_counters.h:fix wrong word
...
Signed-off-by: zhang.zezhu <zhang.zezhu@zte.com.cn>
2016-10-30 02:26:37 +00:00
Kefu Chai
5354e7c26f
Merge pull request #11314 from jcsp/wip-mgr-flake8
...
pybind: clean up mgr stuff for flake8
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-29 12:21:33 +08:00
Kefu Chai
278632c28f
Merge pull request #11650 from wjwithagen/wip-wjw-log-loging
...
Log: Replace namespace log with logging
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-29 12:11:08 +08:00
Kefu Chai
15ebffaf4e
Merge pull request #11680 from tchaikov/wip-17728
...
test/ceph_test_msgr: do not use Message::middle for holding transient…
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-10-29 11:43:07 +08:00
David Zafman
d22d6ca649
Merge pull request #11397 from dzafman/wip-scrub-misc
...
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-28 11:17:12 -07:00
Kefu Chai
56896a7ed2
test/ceph_test_msgr: do not use Message::middle for holding transient data
...
Message::middle is used for holding encoded data, so we we can not stuff
it with payload and leave the "payload" field empty. this change
refactors the ceph_test_msgr by introducing a Payload class which
encodes all test data in it.
Fixes: http://tracker.ceph.com/issues/17728
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-10-29 02:06:37 +08:00
Kefu Chai
7842ea170d
Merge pull request #11677 from ceph/wip-rocksdb-no-march-native
...
rocksdb: do not build with --march=native
Reviewed-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2016-10-28 21:48:39 +08:00
Jason Dillaman
44bd8db678
Merge pull request #11678 from tchaikov/wip-silence-rbd-warning
...
librbd: silence the unused variable warning
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-10-28 09:23:18 -04:00
Kefu Chai
e321f1539f
librbd: silence the unused variable warning
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-10-28 20:40:02 +08:00
Kefu Chai
4b2046eb68
rocksdb: do not build with --march=native
...
we can not assume that building host has the same arch (or the same cpu
capability) with the target machine.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-10-28 19:00:12 +08:00
Sage Weil
82ee518c21
Merge pull request #11663 from stiopaa1/mds_mdslog_addConstToMemFunc
...
mds/MDLog: add const to member functions
2016-10-28 05:52:23 -05:00
Sage Weil
dcc777a619
Merge pull request #11668 from Enproduktion/master
...
doc: Fixed mapping error in legacy mds command
2016-10-28 05:49:25 -05:00
John Spray
94f08a256e
Merge pull request #11446 from ukernel/wip-cephfs-scan-links
...
tools/cephfs: add scan_links command which fixes linkages errors
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-28 11:03:12 +01:00
John Spray
649f24cffe
Merge pull request #11609 from stiopaa1/mds_snaprealm_unneededuseofcount
...
mds/SnapRealm: remove unneeded use of count
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-28 11:01:59 +01:00
John Spray
c88a71a8a8
Merge pull request #11625 from stiopaa1/mds_damageTable_removeUnneededCount
...
mds/DamageTable.cc: remove unneeded use of count
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-28 11:01:34 +01:00
Kefu Chai
e7291ce22c
Merge pull request #9304 from dzafman/wip-13937
...
osd: handle EC recovery read errors
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-28 17:21:09 +08:00
Venky Shankar
f2ef834413
Merge pull request #11645 from dillaman/wip-librbd-discard-after-write
...
test: new librbd discard after write test case
2016-10-28 14:26:49 +05:30
Yan, Zheng
d98a6eea2d
Merge pull request #11670 from stiopaa1/mds_mutation_addConstToMemFun
...
mds/Mutation.h: add const to member functions
2016-10-28 02:31:40 -05:00
Yan, Zheng
5c8e873c87
Merge pull request #11608 from atheism/mds-duplicated-check
...
client: Client.cc: remove duplicated op type checking against CEPH_MD…
2016-10-28 02:25:53 -05:00