RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,550 Commits 216 Branches 394 Tags 1.8 GiB
98f955ed66
Commit Graph

81550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mykola Golub
41bdd8b6d4 librbd: remove unused member in FlattenRequest 
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-12-09 11:47:01 +02:00
Yan, Zheng
debb556076 mds: properly eval locks after importing inode 
We should call Locker:eval() for all imported inodes who have non-zero
'wanted caps'. MDS does not properly handle following case.

- client open a inode for read, it send a cap message to MDS.a (the cap
  message updates 'wanted caps')
- MDS.a receive the cap message, the inode is non-auth and is ambiguous
  auth. MDS.a can not request 'wanted caps' from auth mds.
- MDS.a finishes importing the inode from. But no caps are imported and
  mds_caps_wanted map is empty.

The bug can cause read hang.

Fixes: http://tracker.ceph.com/issues/22357
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2017-12-09 15:05:11 +08:00
Kefu Chai
74a132d826
Merge pull request #19398 from tchaikov/wip-install-deps-use-dts 
install-deps.sh: use DTS on centos if GCC is too old

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-12-09 11:51:33 +08:00
Shinobu Kinjo
fb50bde049 journal: Trivial cleanup 
Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
 2017-12-09 12:42:32 +09:00
David Zafman
0f764890d9
Merge pull request #19368 from dzafman/wip-22086 
ceph-objectstore-tool: Add option "dump-import" to examine an export

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-12-08 19:37:45 -08:00
Kefu Chai
b38621f302 ceph.spec: use dts-7 on rhel 
devtoolset-7 is available for RHEL, but not for centos. only dts-6 is
available for centos.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-12-09 11:18:27 +08:00
David Zafman
c4602c9ac8 test: ceph_objectstore_tool.py: Perform dump-import 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2017-12-08 18:50:04 -08:00
root
dfabb21d9f mds: Improve the log info for read pointers 
Signed-off-by: dongdong tao <tdd21151186@gmail.com>

fix
 2017-12-09 09:30:22 +08:00
Sage Weil
a16ff1a7cd
Merge pull request #19382 from rishabh-d-dave/docfix-ceph-osd-ls 
doc/man: add "ls" to "ceph osd" command's subcommands list
 2017-12-08 18:31:35 -06:00
Jesse Williamson
a286fd35ce osd: migrate PGLOG_* macros to constexpr 
Fixes: http://tracker.ceph.com/issues/20811
Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
 2017-12-08 10:10:42 -08:00
Jan Fajerski
0457043d2f mon: reenable timer to send digest when paxos is temporarily inactive 
Fixes: http://tracker.ceph.com/issues/22142

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
 2017-12-08 16:58:23 +01:00
songweibin
9eff61bf52 pybind/rbd: support open the image by image_id 
We can initialize an image with image name or image id.

Signed-off-by: songweibin <song.weibin@zte.com.cn>
 2017-12-08 23:58:16 +08:00
Jason Dillaman
53be4ef96c
Merge pull request #19005 from shinobu-x/src_krbd 
rbd: drop unnecessary using declaration, etc

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-12-08 10:18:22 -05:00
Yao Zongyou
4586cfbf99 rgw-admin: properly filtering bucket stats by user_id or bucket_name 
If both --uid and --bucket args are provided, properly filtering
bucket stats by user_id and bucket_name.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-12-08 21:26:09 +08:00
Kefu Chai
4cedada14e install-deps.sh: enable testing repo on centos on aarch64 
the DTS-6 is only available in the testing repo

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-12-08 21:15:53 +08:00
Jason Dillaman
899a2f9d38
Merge pull request #19338 from vshankar/rbd-mirror-image-map-timestamp 
rbd-mirror: persist image map timestamp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-12-08 07:15:30 -05:00
Jason Dillaman
7d0149e167
Merge pull request #19383 from trociny/wip-snapshot-copy 
librbd: deep_copy: don't create snapshots above snap_id_end

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-12-08 07:15:06 -05:00
Kefu Chai
3f8647a7e8 install-deps.sh: use DTS on centos if GCC is too old 
please note, run-make-check.sh sources install-deps.sh here to import
the $PATH and other environmental variables, which could be changed by
the the DTS "enable" script.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-12-08 19:36:58 +08:00
Sage Weil
604dc4decb
Merge pull request #19395 from tchaikov/wip-debian-control-upgrade 
debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-12-08 02:34:22 -06:00
Kefu Chai
ec16e941f1
Merge pull request #19341 from tchaikov/wip-22301 
ceph.spec: use devtoolset-6-gcc-c++ on aarch64
 2017-12-08 15:24:48 +08:00
Kefu Chai
ee14a079ba
Merge pull request #19336 from amitkumar50/cov-misc-14 
osd,os,io: Initializing C_ProxyChunkRead members,queue,request

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-12-08 15:24:11 +08:00
Kefu Chai
b939ab88f1
Merge pull request #19295 from kungf/scrub_delayed 
osd: change op delayed state to 'waiting for scrub'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-12-08 15:23:30 +08:00
Kefu Chai
572bae9b44
Merge pull request #19345 from ivancich/wip-bring-in-dmclock 
osd: pull latest dmclock subtree

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-12-08 15:19:59 +08:00
Kefu Chai
e6973f8b0f
Merge pull request #19027 from tangwenjun3/wip-flush-reduce 
os/bluestore: reduce meaningless flush

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-12-08 15:19:01 +08:00
Kefu Chai
1b9ba1a5fd
Merge pull request #19348 from adamemerson/wip-murdering-diagnostics 
Add noreturn attribute to silence uninitialized warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-12-08 15:17:49 +08:00
Kefu Chai
809a0ce816 debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move 
this is a follow-up of #19328. we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cdf49ba664)
 2017-12-08 14:51:08 +08:00
Sage Weil
9271d52851 debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move 
The backport didn't make 12.2.2, but it will be in 12.2.3.

Fixes: http://tracker.ceph.com/issues/22319
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e0c814266f)
 2017-12-08 14:51:08 +08:00
Bingyin Zhang
f767aafd42 rgw: optimize memory usage in function rgw_bucket::get_key 
* In function rgw_bucket::get_key, the reserved 12 bytes is only useful
* for rgw_bucket_shard::get_key.

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
 2017-12-08 11:56:09 +08:00
Yao Zongyou
cd926bce28 common: remove already included header files 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-12-08 11:47:05 +08:00
Yao Zongyou
c8ea7d814b rgw: remove already included header files 
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
 2017-12-08 11:43:59 +08:00
Sage Weil
32f67852af
Merge pull request #19356 from tchaikov/wip-18589-mimic-dev1 
debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-12-07 21:19:26 -06:00
Vasu Kulkarni
e7883c1fb2 qa/tests: when no branch is specified, use wip branch under test for upgrade 
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
 2017-12-07 19:11:42 -08:00
Vasu Kulkarni
9430f352f4 qa/tests: Fix mapped_role attribute where it gets overwritten for subsequent calls. 
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
 2017-12-07 19:11:42 -08:00
Vasu Kulkarni
67ff2de694 qa/tests: update upgrade tests from jewel->luminous to jewel->luminous->master 
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
 2017-12-07 19:11:42 -08:00
Sage Weil
788d88a9ef
Merge pull request #18752 from liewegas/wip-peering-queue 
osd: put peering events in main sharded wq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2017-12-07 19:43:16 -06:00
Willem Jan Withagen
beca358fb2 include: xlist: Fix Clang error for missing string 
Clang complains:
home/jenkins/workspace/ceph-master/src/include/xlist.h:210:13: error: invalid operands to binary exp
ression ('std::ostream' (aka 'basic_ostream<char>') and 'const char *')
        oss << ", ";
        ~~~ ^  ~~~~
1 error generated.

include ostream to fix Clang error

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2017-12-08 00:28:33 +01:00
Mykola Golub
9ca3f46b96 librbd: deep_copy: move set_head to snapshot_copy state machine 
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-12-08 00:17:16 +02:00
Mykola Golub
644c319181 librbd: deep_copy: don't create snapshots above snap_id_end 
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
 2017-12-08 00:16:58 +02:00
Adam C. Emerson
f6173b6a9c os/bluestore: Call get_str_map under with_val 
Another heap allocation bites the dust.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:12 -05:00
Adam C. Emerson
f26851b6d4 os/bluestore: Do not copy a string just to find its length 
I really dislike whoever decided to disallow taking the address of
member functions in the standard library.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
7344796570 msg: Use with_val, don't copy a string just to call find 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
777edc181d mon: Call get_json_str_map under wth_val 
To avoid temporary heap allocations.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
8dafb23516 mgr: Call _list_modules under with_val 
Avoid a temporary heap allocation.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
d65b89e839 kv/RocksDB: Do comparisons under with_val 
Rather than making a copy on the heap just to compare it.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
e4ec116abb kv/RocksDB: Use for_each_substr under with_val 
Minimize the number of copies we make.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:11 -05:00
Adam C. Emerson
472491b9bd common: Add with_val to md_config_t 
Since passing back references that persist after we drop a lock is
unsafe, allow functions to be called on a reference under the lock.

This way we can compare strings or otherwise examine them without
needing to make a copy.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:07 -05:00
Adam C. Emerson
f14d90254b rgw: Disambiguate call to max 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
 2017-12-07 15:46:06 -05:00
Alfredo Deza
c0dd4a8314 ceph-volume test logging ignored ceph.conf file 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 15:03:52 -05:00
Alfredo Deza
c1d2bd52c0 ceph-volume main warn on inability to load ceph.conf, don't raise 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 15:03:45 -05:00
Alfredo Deza
38c3547a1b ceph-volume tests.api ensure that we can handle non-ceph tags in lvs 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2017-12-07 14:55:17 -05:00