RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,480 Commits 212 Branches 394 Tags 1.5 GiB
f4398d2e6c
Commit Graph

40480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vicente Cheng
f4398d2e6c Fixed the ceph get mdsmap assertion. 
When we want to get mdsmap, we try to get_version()
    and the return value err = 0 means success.

    The assert verified r == 0. r would not change in this flow.
    It always meet assert and lead mon failure.

    I think this verify should be:
        assert(err == 0)
    It will help to check return value of get_version().

If you have any questions, feel free to let me know.
Thanks!

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
 2015-03-27 18:49:28 +08:00
Kefu Chai
d3029fe72a Merge pull request #4193 from larkly/patch-docerror-erasure 
doc: Incomplete example in erasure-coded-pool.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-27 18:31:16 +08:00
Sage Weil
877d5d8820 Merge pull request #4171 from majianpeng/cleanup 
common: print hexadecimal for ghobject_t.generation.

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-26 17:45:20 -07:00
Bosse Klykken
d6acc6a581 Doc: Incomplete example in erasure-coded-pool.rst 
Signed-off-by: Bosse Klykken <larkly@gmail.com>
 2015-03-26 21:31:16 +01:00
Josh Durgin
887354099e Merge pull request #4113 from wonzhq/rbd-fix 
rbd: misc fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-03-26 10:06:37 -07:00
Loic Dachary
9008a3391d Merge pull request #4188 from XinzeChi/wip-test-1 
test: add compile-command for test_ceph_daemon.py

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-26 07:45:05 +01:00
Xinze Chi
9418e432ad test: add compile-command for test_ceph_daemon.py 
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
 2015-03-26 13:58:33 +08:00
Jianpeng Ma
aa6a46cfd9 common: print hexadecimal for ghobject_t.generation & shard_id 
In filestore, it use hexadecimal for ghobject_t.generation &
shard_id. Make the same.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-03-26 13:51:02 +08:00
Loic Dachary
896310c0b8 Merge pull request #4181 from ceph/wip-rpm-systemd-conditional-syntax 
ceph.spec.in: fix _with_systemd conditional

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-25 21:40:22 +01:00
Gregory Farnum
97234c94ee Merge pull request #4182 from ceph/wip-replicatedpg-signed 
ReplicatedPG: fix a signed/unsigned comparison warning

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-03-25 13:39:04 -07:00
Greg Farnum
e51761233e ReplicatedPG: fix a signed/unsigned comparison warning 
This mismatch about whether pool IDs are signed or unsigned is
a persistent annoyance. I'm now casting the unsigned down to signed space
because apparently the OSD is using negative IDs for temporary object
namespaces.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-25 12:03:38 -07:00
Ken Dreyer
c5cf81dd91 ceph.spec.in: fix _with_systemd conditional 
The RPM conditional needs a "?" in the event that it is not defined.
 2015-03-25 12:16:03 -06:00
Sage Weil
2724ce2d1b Merge remote-tracking branch 'gh/hammer' 
Conflicts:
	src/gmock
 2015-03-25 10:30:20 -07:00
Sage Weil
1b81d8c029 Merge pull request #3688 from XinzeChi/wip-clear-transaction 
osd: new transcation if needed

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-25 10:28:25 -07:00
Sage Weil
cc3527a51e Merge pull request #3870 from majianpeng/cache-tier 
Cache tier bug fixs

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-25 10:27:56 -07:00
Sage Weil
6748ff9522 Merge pull request #3679 from mslovy/wip-findObjectContext-opt 
ReplicatedPG:: find_object_context clear extra creation (head,snapdir)

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-25 10:24:43 -07:00
Sage Weil
82d9153f01 Merge pull request #4065 from majianpeng/pgop-memleak 
osd/ReplicatedPG: Fix a memory leak in do_pg_op.

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-25 10:24:17 -07:00
Sage Weil
29d0d46db8 Merge pull request #3974 from majianpeng/fgetattr-fix 
os/FileStore: For getxattr, enlarge the value size avoid try again.

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-25 10:24:00 -07:00
Sage Weil
c639ce51ac Merge pull request #3604 from yghannam/yazen-testing 
crc32c: add aarch64 optimized crc32c implementation

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-25 10:06:46 -07:00
Sage Weil
dca722ec7b Merge pull request #4073 from jdurgin/wip-lttng-daemon 
common, global: use lttng ust functions for handling fork-like calls

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-25 10:06:13 -07:00
Danny Al-Gaaf
24aeb78bb0 Merge pull request #3916 from ceph/wip-rpm-no-ghost-socket-dir 
ceph.spec.in: fix handling of /var/run/ceph

Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
 2015-03-25 17:27:14 +01:00
Kefu Chai
8654b65740 Merge pull request #4000 from ceph/wip-da-SCA-20150312 
Fixes for Covertity issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-26 00:12:35 +08:00
Samuel Just
6994648bc4 Merge pull request #4128 from dzafman/wip-11139-hammer 
ceph-objectstore-tool: Use exit status 11 for incompatible import attemp...

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-03-25 08:29:31 -07:00
Samuel Just
0ff3d58757 Merge pull request #4124 from ceph/wip-omap-clear 
osd: fix omap_clear handling

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-03-25 08:27:59 -07:00
Loic Dachary
dc85cb946d Merge pull request #4179 from ceph/wip-11065 
unit/tox tests structure for ceph-disk

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-25 16:27:20 +01:00
Alfredo Deza
6e6771e616 ceph-disk: add test files to EXTRA_DIST 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2015-03-25 10:10:43 -04:00
Alfredo Deza
b3019824bb ceph-disk: remove double import 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2015-03-25 09:47:13 -04:00
Alfredo Deza
0f267c15ea ceph-disk: create initial structure for tox/unit tests 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2015-03-25 09:46:16 -04:00
Gregory Farnum
e7e0ea626e Merge pull request #4170 from ceph/hammer-11205 
qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-24 21:35:29 -07:00
Yan, Zheng
6f218b1603 qa/workunits/fs/misc: fix filelock_interrupt.py 
Handle the case that kernel does not support fcntl.F_OFD_SETLK.
Also fix the code that checks if fnctl fails with errno == EINTR.

Fixes: 11205
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 4ececa3dc4)
 2015-03-25 11:10:56 +08:00
Sage Weil
4dbb9c872e Merge pull request #4162 from athanatos/wip-11156 
ReplicatedPG::promote_object: check scrubber and block if necessary

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-24 12:15:21 -07:00
Sage Weil
2c181c2ae8 Merge pull request #4164 from athanatos/wip-revert-degraded-writes-release-notes 
release-notes.rst: update for degraded writes revert
 2015-03-24 09:43:38 -07:00
Samuel Just
0f92f346a3 release-notes.rst: update for degraded writes revert 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-03-24 09:39:42 -07:00
Samuel Just
836fdc512d Merge pull request #4163 from athanatos/wip-revert-degraded-writes 
Wip revert degraded writes

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-24 09:31:13 -07:00
Sage Weil
40147d8c5e Merge pull request #4161 from trhoden/cephdeploy_not_new 
doc: no longer call out ceph-deploy as new
 2015-03-24 09:23:38 -07:00
Travis Rhoden
e1ca446c78 doc: no longer call out ceph-deploy as new 
The tip declaring ceph-deploy as new doesn't really apply anymore.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
 2015-03-24 12:05:07 -04:00
Loic Dachary
257ba2b2db Merge pull request #4154 from XinzeChi/wip-test-lfn-index 
bug fix: test case for lfn index

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-24 14:05:23 +01:00
Kefu Chai
9da1d1f52e Merge pull request #4150 from javierguerragiraldez/master 
libradosstriper: declare libradosstriper library dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-24 20:48:00 +08:00
Kefu Chai
0fdcbb863e Merge pull request #4157 from majianpeng/cleanup 
librados: remove the unused flags.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-24 20:19:57 +08:00
Jianpeng Ma
4bd2bd6bb8 librados: remove the unused flags. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-03-24 19:04:35 +08:00
Xinze Chi
791c3879d6 bug fix: test case for lfn index 
tests: TestFlatIndex.cc races with TestLFNIndex.cc
Both use the same PATH and when run in parallel they sometime conflict.

Fixes: #11217
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
 2015-03-24 18:42:04 +08:00
Kefu Chai
8dd9f6a4ed Merge pull request #4099 from rajukv/xio-bugfix 
XIO: Handle queued incoming XIO messages during retry

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-24 11:31:53 +08:00
Sage Weil
ed5ee16747 Merge pull request #4152 from ceph/wip-11145 
rgw: shut down timer before erroring out

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-23 18:11:08 -07:00
Sage Weil
c50255fc24 doc/release-notes: draft hammer release notes 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-23 16:59:55 -07:00
Alexandre Marangone
7f03c8891a be gender neutral 
Signed-off-by: Alexandre Marangone <amarango@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-23 16:59:55 -07:00
Yehuda Sadeh
924ace882e rgw: shut down timer before erroring out 
Fixes: #11145
Backport: hammer

Clean up initialization timer, otherwise if we error out, we'll assert.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-03-23 16:21:14 -07:00
Javier Guerra
7413cd7f40 Declare libradosstriper library dependencies 
When omitted, trying to dynamically load libradosstriper results in "undefined symbol" errors.

Signed-off-by: Javier Guerra <javier@guerrag.com>
 2015-03-23 17:44:31 -05:00
Loic Dachary
cb47998213 Merge pull request #4081 from ian-kelling/master 
doc: consistent alternate cluster name arguments

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 23:42:46 +01:00
Samuel Just
65bb4df599 ReplicatedPG::promote_object: check scrubber and block if necessary 
Otherwise, we might attempt to promote into an in-progress scrub
interval causing 11156.  I would have added a return value to
promote_object(), but could not find an existing user which
cared to distinguish the cases, even with a null op passed.
All existing users are in maybe_handle_cache.  The ones which
pass a null op are for promoting the object in parallel
with a proxy -- a case where not actually performing the promote
does not really matter.

Fixes: #11156
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-03-23 14:40:59 -07:00
Loic Dachary
0a3e47d778 Merge pull request #4148 from dobbler123/master 
doc: Fixes spelling and grammatical errors

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 22:30:59 +01:00