RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,583 Commits 211 Branches 394 Tags 1.4 GiB
1ccdcb5b6c
Commit Graph

52583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
850e343d31 Merge pull request #8743 from ceph/revert-8502-song20 
Revert "crushtool: do not allow to compile crushmap with repeat rules…

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-25 22:04:02 +08:00
Kefu Chai
edfe301a50 Revert "crushtool: do not allow to compile crushmap with repeat ruleset." 2016-04-25 22:00:47 +08:00
Ved-vampir
c127e6ce7e compressor: fix of error code control in zlib decompress 
Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
 2016-04-25 14:00:21 +03:00
Kefu Chai
ff18083d23 Merge pull request #8725 from liewegas/wip-make-check 
test/encoding/readable.sh: fix make check for autotool

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-25 13:58:20 +08:00
Sage Weil
65a3c21931 test/encoding/readable.sh: fix make check for autotools 
Use ./ if ceph-dencoder is in the local directory.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-25 01:12:45 -04:00
Kefu Chai
9d3c0d5b46 Merge pull request #8719 from SUSE/wip-fix-multidump 
multi-dump.sh: fix usage function

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-25 11:04:47 +08:00
ibravo
893b7a0069 Doc: Updated ceph-deploy osd to choose underlying file system 
Included paragraph about --fs-type and --bluestore

Signed-off-by: Ignacio Bravo ibravo@hotmail.com
 2016-04-24 20:28:35 -04:00
ibravo
485ef83e58 Doc: Update quick-ceph-deploy.rst 
Signed-off-by: Ignacio Bravo ibravo@hotmail.com
 2016-04-24 19:28:55 -04:00
Sage Weil
47ddc266b5 osd/osd_types: render notify OSDOp properly 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-24 16:03:05 -04:00
Sage Weil
749fcadfd3 Merge pull request #8640 from xiexingguo/xxg-wip-osdsideeffect 
osd/ReplicatedPG: allow CMPXATTR ops to trigger side effects too

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:51:06 -04:00
Sage Weil
56697d0406 Merge pull request #8694 from wuxingyi/fixincomplete 
osd/PG: PG is only likely to go active when min_size turns smaller.

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:50:00 -04:00
Sage Weil
401804e354 osd: honour result code passed in; tidy-up changesReviewed-by: Sage Weil <sage@redhat.com> 
osd: honour result code passed in; tidy-up changes

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:49:09 -04:00
Sage Weil
c78b354eff Merge pull request #8675 from roidayan/xio-build_deb_with_xio 
xio: add MNop.h to dist tarball

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:48:35 -04:00
Sage Weil
2f2cb9eb42 Merge pull request #8678 from jack-changtao/pgbackend 
osd/PGBackend: if min > max, PGBackend::objects_list_partial will list all objects of that pg

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:48:25 -04:00
Sage Weil
c2defeb2c0 Merge pull request #8680 from ceph/rm-distribute 
tools: remove installation for distribute. It is no longer maintained

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:48:09 -04:00
Sage Weil
2c3ef6d7ed Merge pull request #8681 from xiexingguo/xxg-wip-crushfix 
crush: fix mishandled result of get_bucket() method

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:47:57 -04:00
Sage Weil
93d7deff53 Merge pull request #8707 from liewegas/wip-kv-merge 
kv: add merge operator support, fix test

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:47:22 -04:00
Sage Weil
1e1d898d1f Merge pull request #8688 from xiexingguo/xxg-wip-crushtooltip 
tools/crushtool: add straw2 support for help message

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:47:08 -04:00
Sage Weil
e4409981b8 Merge pull request #8671 from majianpeng/rados-objectsize-smaller-blocksize 
tools/rados: fix "Floating point exception" if  objectsize smaller than  blocksize when do write-bench.

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:46:57 -04:00
Sage Weil
8c3ddbea8b Merge pull request #8502 from songbaisen/song20 
crushtool: do not allow to compile crushmap with repeat ruleset.

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 15:46:40 -04:00
Sage Weil
bf93c05e41 Merge pull request #8724 from aderumier/master 
sysvinit: fix ceph init script

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-24 10:31:09 -04:00
Alexandre Derumier
b581dd56be fix ceph init script 
commit 65963739cd have introduce a bug

test variables need to be quoted, or -n always return true, even if variables don't exist
 2016-04-24 09:55:35 +02:00
wangsongbo
048469255b doc: correct wrong spell 'mnay' to 'many' 
Signed-off-by: wangsongbo <wangsongbo@unitedstack.com>
 2016-04-24 11:19:09 +08:00
Nathan Cutler
bc9478edc6 multi-dump.sh: fix usage function 
The usage() function was not producing any output.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-04-23 18:43:16 +02:00
Nathan Cutler
df893f395e systemd: make Ceph daemon units "want" time-sync.target 
Fixes: http://tracker.ceph.com/issues/15419

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-04-23 17:48:08 +02:00
Karol Mroz
088cc66a94 global-init: fixup inconsistent use of ceph ctx and conf 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-23 15:41:52 +02:00
Karol Mroz
9c82d8466a global-init: chown pid files 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-23 15:41:51 +02:00
Karol Mroz
9d513793b3 global-init: chown run dir 
Also performs log file chown() operations if permission drop has been
deferred. Documents that admin socket chown() happen in the common init
path.

Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-23 15:41:51 +02:00
Karol Mroz
206585c1d0 common-init: chown admin socket after service thread started 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-23 15:41:51 +02:00
Karol Mroz
a0ad13db7a global-init: check init flags and set accordingly 
If init flags have changed between the time ceph context was
instantiated and now, update them. This can happen, for example, if
between manual global_pre_init() and global_init() calls, a daemon adds
modifies it's init flags.

Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-23 13:36:01 +02:00
Karol Mroz
860977b105 global-init: add a path chown wrapper function 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-23 13:35:02 +02:00
Karol Mroz
aecab14089 ceph-context: add function to set init flags 
Signed-off-by: Karol Mroz <kmroz@suse.com>
 2016-04-23 13:32:45 +02:00
Yan Jun
69a587b139 msg/async: delete the confused comments. 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-04-23 15:50:35 +08:00
Yan Jun
f08ca0a089 msg/async: add numevents statistics for external_events 
Maybe we need to add the statistics for external_events.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2016-04-23 15:50:35 +08:00
runsisi
bc67d0c805 cmake: use LINK_PRIVATE instead of PRIVATE for CMake version == 2.8.11 
with version 2.8.11, i.e., the minimum version required by the building
system, we will hit a compile error as follows:
  /usr/bin/ld: cannot find -lPRIVATE
  collect2: error: ld returned 1 exit status
  make[2]: *** [lib/librbd.so.1.0.0] Error 1
  make[1]: *** [src/librbd/CMakeFiles/librbd.dir/all] Error 2

Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-04-23 14:57:36 +08:00
Sage Weil
c3b595f284 Merge pull request #7942 from xiexingguo/xxg-wip-fixdirtyinc 
mon: OSDMonitor: improve pool creation logic

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Xiaoxi Chen <xiaoxchen@ebay.com>
 2016-04-22 20:21:57 -04:00
Sage Weil
7893e9fd26 Merge pull request #7997 from songbaisen/song11 
osdc: Reverse the probing vector in better way.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-22 20:20:57 -04:00
Sage Weil
c0cf1744bf Merge pull request #8384 from songbaisen/song18 
crush: when take place the crush map should consider the rule is in …

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 20:20:29 -04:00
Sage Weil
72d2ae02a4 Merge pull request #8591 from xiexingguo/xxg-wip-15492 
test: generate temp pool name in a safer way

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 20:19:47 -04:00
Sage Weil
c26ebd9a64 Merge pull request #8577 from runsisi/wip-fix-op-lock 
osdc/Objecter: small cleanup for osd op completion lock

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 20:19:32 -04:00
Sage Weil
89ef459415 Merge pull request #8596 from xiexingguo/xxg-wip-blue 
os/filestore: add sanity check for stat() syscall

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 20:18:51 -04:00
Yuri Weinstein
ef76c5c3ac Merge pull request #8710 from ceph/wip-rename-tests 
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
 2016-04-22 16:06:59 -07:00
Tamil Muthamizhan
0fd358b877 Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com> 
renamed the workunit and test to reflect reality and for better clarity
 2016-04-22 18:25:46 -04:00
Sage Weil
a887db7611 Merge pull request #8395 from renhwsky/renhw-wip-monmap 
mon/monmap:  conditional optimization in build_from_host_list

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-04-22 17:18:56 -04:00
Sage Weil
dcd211cdd1 Merge pull request #8449 from javacruft/ceph-osd-prestart 
ceph-osd-prestart.sh: drop --setuser/--setgroup

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 17:06:44 -04:00
Sage Weil
bf6892bf9f Merge pull request #8458 from jjhuo/clean_blue_configs 
common/config_opts: remove invalid config options of bluestore

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-22 17:04:02 -04:00
Sage Weil
26d7528b36 Merge pull request #8463 from majianpeng/bluestore-zero-truncate 
os/bluestore/BlueStore: Don't forget assign nid when offset > size in _do_zero

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 17:03:20 -04:00
Sage Weil
b06966c761 Merge pull request #8706 from liewegas/wip-jewel 
doc/release-notes: is, not will be, basis for LTS

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-04-22 16:47:31 -04:00
Allen Samuels
4d2ad1046b kv/RocksDBStore: implement merge operator 
Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
 2016-04-22 16:44:09 -04:00
Allen Samuels
abbececc78 kv/KeyValueDB: add merge operator interface and test 
Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-22 16:41:46 -04:00