Commit Graph

28952 Commits

Author SHA1 Message Date
Gregory Farnum
bf4234c0be Merge pull request #663 from ceph/wip-cancel-copy
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-10-01 10:23:17 -07:00
Sage Weil
3d062c2a23 rbd: fix cli test
Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-01 10:02:40 -07:00
Yehuda Sadeh
055e31359a rgw: quiet down warning message
Fixes: #6123
We don't want to know about failing to read region map info
if it's not found, only if failed on some other error. In
any case it's just a warning.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-10-01 09:22:00 -07:00
Sage Weil
75b94ba295 osd/ReplicatedPG: fix iterator corruption in cancel_copy_ops()
The cancel_copy() method removes the entry from copy_ops.  Move the
iterator forward before calling.

Fixes segfault when thrashing osds with a copy-from workload.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-10-01 08:56:12 -07:00
Guangliang Zhao
409aba6ff5 rbd.cc: add readonly option for "rbd map"
The device could only be set to rw(default) when mapping
now. This patch only handle the user space, because the
kernel part has been completed.

Signed-off-by: Guangliang Zhao <guangliang@unitedstack.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-09-30 20:34:53 -07:00
Sage Weil
56711370c3 Merge pull request #660 from ceph/wip-fs-crc
sloppy / opportunistic CRC tracking in the filestore

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-09-30 16:21:29 -07:00
Sage Weil
b245ca151b os/FileStore: add sloppy crc tracking
Opportunistically track CRCs for data we write and verify it for data
we read.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-30 16:21:17 -07:00
Sage Weil
4c8fbe082e Merge pull request #661 from ceph/wip-copy-cleanups
Wip copy cleanups

Reviewed-by: Sage Weil <sage@inktank.com>
2013-09-30 15:02:02 -07:00
Greg Farnum
c8054ac57b ReplicatedPG: remove unused CopyOp::waiting member, rename function for accuracy
We never placed any ops here, and so we weren't ever requeuing any ops.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-09-30 14:49:37 -07:00
Greg Farnum
7bf8cb7d9f ReplicatedPG: remove useless pcop param from start_copy
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-09-30 14:49:37 -07:00
Greg Farnum
7f3165b52c ReplicatedPG: use our already-found iterator instead of going back into map
We have an iterator pointing at the element we want; no need to search
the map again in order to grab the element or remove it.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-09-30 14:49:36 -07:00
Sage Weil
392387449a common/SloppyCRCMap: add type to sloppily track crcs
Signed-off-by: Sage Weil <sage@inktank.com>

sloppy
2013-09-30 13:54:00 -07:00
Sage Weil
76321f8fc8 Merge remote-tracking branch 'gh/next'
Conflicts:
	src/common/crc32c_intel_fast.c
2013-09-27 21:10:50 -07:00
Sage Weil
d6ec7891eb Merge pull request #658 from dmick/next
ceph.in: fix missing exception variable in failure to open -o file

Reviewed-by: Sage Weil <sage@inktank.com>
2013-09-27 21:09:43 -07:00
Dan Mick
b6f278c886 ceph.in: fix missing exception variable in failure to open -o file
Fixes: #6424
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-09-27 17:07:26 -07:00
Josh Durgin
cd566a4c0e Merge pull request #657 from ceph/wip-6397
Wip 6397

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-09-27 17:06:04 -07:00
Yehuda Sadeh
1e9e34bc17 rgw: don't append NULL char before json parsing
Parser handles that by itself.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-09-27 16:45:11 -07:00
Yehuda Sadeh
793d9d27b2 ceph_json: use different string constructor for parser buffer
Fixes: #6397
Previous implementation did not user the constructor with the length
param.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-09-27 16:44:19 -07:00
Sage Weil
058f5356c5 Merge pull request #643 from dachary/master
autoconf: fix build out of tree

Reviewed-by: Sage Weil <sage@inktank.com>
2013-09-27 14:31:17 -07:00
John Wilkins
4fe01b1f1d doc: changed journal aio default to true.
fixes: #6389

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-09-27 13:59:13 -07:00
Joao Eduardo Luis
a3aa00578b qa: workunits: mon: test snaps ops using rbd.
Regression test for #6047

Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>
(cherry picked from commit b2b0f202ea)
2013-09-27 13:44:53 -07:00
Sage Weil
2d3eb52e6a Merge pull request #654 from ceph/wip-testrados
fix some issues with ceph_test_rados

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-09-27 13:40:45 -07:00
Sage Weil
efc6b5ea1c ceph_test_rados: remove useless snapc setup
We update this on snap create and delete; no need to do it any other
time.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-27 11:23:38 -07:00
Sage Weil
37d722093d ceph_test_rados: update for copy_from in begin, not finish
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-27 11:23:09 -07:00
Sage Weil
b06c1898ea common/crc32c_intel_fast: avoid reading partial trailing word
The optimized intel code reads in word-sized chunks, knowing that the
allocator will only hand out memory in word-sized increments.   This makes
valgrind unhappy.  Whitelisting doesn't work because for some reason there
is no caller context (probably because of some interaction with yasm?).

Instead, just use the baseline code for the last few bytes.  This should
not be significant.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 39c89dcfed)

Conflicts:
	src/test/common/test_crc32c.cc
2013-09-27 10:55:41 -07:00
Loic Dachary
6347fcf7dd Merge pull request #650 from dachary/wip-6425-2
pybind: update osd blacklist tests for nonce
2013-09-27 03:58:23 -07:00
Loic Dachary
e6e8cb8ddd pybind: update osd blacklist tests for nonce
Update the unit tests to reflect a) that the nonce is no longer mandatory,
b) that it must be an integer.

http://tracker.ceph.com/issues/6426 refs #6426

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
2013-09-27 12:25:39 +02:00
Sage Weil
0bfda47036 test/common/get_command_descriptions: null terminate c string
This fixes a bunch of trailing goop I see on my machine.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-26 18:30:06 -07:00
Sage Weil
493427ddd6 Merge remote-tracking branch 'gh/next'
Conflicts:
	src/pybind/ceph_argparse.py
2013-09-26 18:24:40 -07:00
Sage Weil
5e3145a4d3 Merge pull request #648 from dmick/wip-6425
ceph_argparse.py, cephtool/test.sh: fix blacklist with no nonce

Reviewed-by: Sage Weil <sage@inktank.com>
2013-09-26 18:21:04 -07:00
Sage Weil
c5831fa1b7 ceph_test_rados: improve debug output
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-26 18:15:32 -07:00
Sage Weil
eec315f248 ceph_test_rados: fix update_object_full
Update at current snap, not the last snap we did an update.

Broken this this was introduced in 996af2d8fd

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-26 18:14:46 -07:00
Dan Mick
1ba7e47c6a ceph_argparse.py, cephtool/test.sh: fix blacklist with no nonce
It's legal to give a CephEntityAddr to osd blacklist with no nonce,
so allow it in the valid() method; also add validation of any nonce
given that it's a long >= 0.

Also fix comment on CephEntityAddr type description in MonCommands.h,
and add tests for invalid nonces (while fixing the existing tests to remove
the () around expect_false args).

Fixes: #6425
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-09-26 18:06:30 -07:00
Josh Durgin
60017e074b Merge pull request #646 from liewegas/wip-6385
qa/run_xfstests.sh: use old xfstests until we adapt to new org

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-09-26 16:23:42 -07:00
Josh Durgin
86cd7e922a Merge pull request #647 from ceph/wip-ceph-cli-env
improve ceph clie CEPH_ARGS handling

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-09-26 16:17:33 -07:00
Sage Weil
97f462be48 Revert "ceph: parse CEPH_ARGS environment variable"
This reverts commit 67a95b9880.

We now put CEPH_ARGS in the actual args we parse in python, which are passed
to rados piecemeal later.  This lets you put things like --id ... in there
that need to be parsed before librados is initialized.
2013-09-26 16:06:29 -07:00
Benoît Knecht
30abe3244c Add CEPH_ARGS at the end of sys.argv
This allows, for instance, to pass a different client name to ceph by
exporting CEPH_ARGS="--id client_id".

Signed-off-by: Benoît Knecht <benoit.knecht@fsfe.org>
Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-26 16:06:29 -07:00
Sage Weil
cbf0ba22a8 qa/run_xfstests.sh: use old xfstests until we adapt to new org
Tests were rearranged upstream; use an old version for the time being
until we can refactor run_xfstests.sh to cope.  See #6385

Signed-off-by: Sage Weil <sage@inktank.com>
2013-09-26 15:02:32 -07:00
Gregory Farnum
b5a3978728 Merge pull request #645 from liewegas/wip-6346
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-09-26 13:12:37 -07:00
athanatos
97c56ef3ec Merge pull request #631 from ceph/wip-5857-8
Wip 5857 8

Reviewed-by: Sage Weil <sage@inktank.com>
2013-09-26 12:01:19 -07:00
athanatos
62626b49c4 Merge pull request #546 from ceph/wip-5862
Wip 5862

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-09-26 12:00:22 -07:00
David Zafman
9750965fd3 os: Make write_version_stamp() private
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:29:05 -07:00
David Zafman
55f4aa1914 osd: Remove code for reading ancient unsupported logs
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:29:05 -07:00
David Zafman
4a757eb8e0 os/ObjectStore: Interim collection_list* functions in ObjectStore
Handle ghobject_t to hobject_t conv of collection_list* funcs
Temporary code so that this branch doesn't break master

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:29:05 -07:00
David Zafman
222f5aa6a1 osd: Cleanup init()/read_superblock()
Fix error handling in init()
Cleanup read_superblock() by moving unrelated code into init()
Move init() feature upgrade right after compatibility checking
Remove redundant whoami check

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:29:05 -07:00
David Zafman
aba6efda13 common, os, osd, test, tools: FileStore must work with ghobjects rather than hobjects
Add ghobject_t to hboject.h header
Add constants NO_SHARD/NO_GEN and change gen_t/shard_t
Convert other headers from hobject_t to ghobject_t
Mostly straight hobject_t to ghobject_t for src/os cc files
Fix tools and tests and enable ceph-dencoder
Add filename generation and parsing including unittest addition
Get ceph-filestore-dump to build
Add gen/shard to DBObjectMap::ghobject_key() and update test case
Add CEPH_FS_FEATURE_INCOMPAT_SHARDS new FileStore feature
Add CEPH_OSD_FEATURE_INCOMPAT_SHARDS new osd feature

Fixes: #5862

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:29:05 -07:00
David Zafman
793ba9f1d5 include, test: Add CompatSet::merge() operation
New func merge() adds missing features from specified CompatSet
Add merge testing to unittest

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:29:04 -07:00
David Zafman
c6b83180f9 os, osd, tools: Add backportable compatibility checking for sharded objects
OSD
  New CEPH_OSD_FEATURE_INCOMPAT_SHARDS
FileStore
  NEW CEPH_FS_FEATURE_INCOMPAT_SHARDS
  Add FSSuperblock with feature CompatSet in it
  Store sharded_objects state using CompatSet
  Add set_allow_sharded_objects() and get_allow_sharded_objects() to FileStore/ObjectStore
  Add read_superblock()/write_superblock() internal filestore functions
ceph_filestore_dump
  Add OSDsuperblock to export format
  Use CompatSet from OSD code itself in filestore-dump tool
  Always check compatibility of OSD features with on-disk features
  On import verify compatibility of on-disk features with export data
  Bump super_ver due to export format change

Backport: dumpling, cuttlefish

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:29:04 -07:00
David Zafman
bb195c2438 osd: read_superblock() not outputing unsupported features when incompatible
Use working version of CompatSet::unsupported() to improve log output

Backport: dumpling, cuttlefish

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:24:40 -07:00
David Zafman
4bc8f09f0f test: Adding unittest for CompatSet
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-09-26 11:24:40 -07:00