RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,722 Commits 216 Branches 395 Tags 1.4 GiB
33eae4ec2f
Commit Graph

41722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Zafman
32be302484 test: Use ceph-objectstore-tool --no-overwrite for import-rados 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:14 -07:00
David Zafman
e0627b0e01 test: Test ceph-objectstore-tool --dry-run in select operations 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:14 -07:00
David Zafman
ece630d5a7 test: Fix ceph-objectstore-tool test missing fd.close() 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
11c13eb7c1 test: Fix ceph-objectstore-tool test error message 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
c6e41663e7 ceph-objectstore-tool: If object re-appears after removal, just skip it 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
35cdcabbda ceph-objectstore-tool: Add --no-overwrite flag for import-rados 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
3e7fe7e857 ceph-objectstore-tool: Remove list-lost because now we have --dry-run flag 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
2795161f47 ceph-objectstore-tool: Add --dry-run option 
Fixes: #10290

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
244092d034 ceph-objectstore-tool: Add dump-info command to show object info 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
c00290b836 ceph-objectstore-tool: Use empty string for <object> to specify pgmeta object 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
John Spray
fdb1a4b676 ceph-objectstore-tool: Add a couple of strategically placed prints 
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
a50679a1a3 ceph-objectstore-tool: Clean up error handling 
Use negative errors throughout and positive error to specify exit status
cpp_strerror() handles negative errors
Clean up main() code to use local "ret"
Let end of main() decide how to treat the final value of "ret"

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
548147b412 ceph-objectstore-tool: Create section around log/missing/divergent_priors of --op log 
Remove extra new lines in the output

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
6ad7e9b362 ceph-objectstore-tool: Add divergent_priors handling 
Add to --op log output
Add to metadata_section for export
Add filtering of divergent_priors in case of splits

Fixes: #11237

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
94b3d7632f test: ceph-objectstore-tool: Remove duplicate debug messages, keep cmd/log/call together 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
d80ce6668c test: ceph-objectstore-tool import after split testing 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
1e18e8a88f test: Use CEPH_DIR where appropriate 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
868cf457a3 test: Limit how long ceph-objectstore-tool test will wait for health 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
dff17a800c test: Add optional arg to vstart() to provide additional args to vstart 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:13 -07:00
David Zafman
9b08bcf95c test: Test ceph-objectstore-tool --op dump-journal output 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
b0141108c0 test: Pep8 fixes for ceph-objectstore-tool test 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
2f4090daae ceph-objectstore-tool: Add --force option which is used for import only 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
24f0659896 ceph-objectstore-tool: Fix pgid scan to skip snapdirs 
Long standing bug where it wasn't skipping snapdirs if !debug
For debug output use stderr like all other cases

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
381605e34a ceph-objectstore-tool: Add dump-journal op 
Have dump-journal op directly dump a filestore journal without
mounting or try to dump after mounting.

Fixes: #11135

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
130eba4849 osd: FileJournal: Add _fdump() that takes Formatter instead of ostream 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
1b9f85befa test: Fix ceph-objectstore-tool test, overwrite OTHERFILE so second check is meaningful 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
e30efe6c15 test: ceph_test_filejournal: Conform to test infrastructure requirements 
Only call RUN_ALL_TESTS() once

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
d540dde1fa test: ceph_test_filejournal need to force aio because testing with a file 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
c94fe8db36 test: ceph_test_filejournal fix missing argument to FileJournal constructor 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
8da4d9f633 test: ceph_test_filejournal Add check of journalq in WriteTrim test 
Commit all journal entries and check for empty journalq

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
159f4ccf5c filestore: Change int open_journal() to void new_journal() 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
d580d56883 osd: Fix log output in FileJournal::read_entry() coming from do_read_entry() 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
96c0d076fb os: Add some logging used only by test code 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
8d5464c0f8 osd: Add simple_dump() to FileJournal for unit testing 
Allow a dump when entries aren't ObjectStore::Transaction's

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
12fdf4ced0 osd: FileJournal clean-up 
Move aio / directio adjustments to constructor
Indicate functions which only operate before journal is active
Make functions const when possible
Move push_back() of journalq to read_entry()
Change dump() to use do_read_entry() to minimize side effects

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:12 -07:00
David Zafman
3c97b32131 osd: Dump header in FileJournal::dump() 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
David Zafman
a7cda53d20 osd: FileJournal::read_entry() can't use a zero seq to check for corruption 
Seen when using dump() on a journal which has all entries committed

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
David Zafman
f2d83520f6 osd: Fix flushing in FileJournal::dump() 
Use ostream arg since caller is specifying
Move flush after last section close

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
David Zafman
409328bace ceph-objectstore-tool: On any exit release CephContext so logging can flush 
Add myexit() which will put() the g_ceph_context if present before exit
Must umount() once the objectstore has been mounted

Fixes: #10809

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
David Zafman
fb2f9d500e ceph-objectstore-tool: Check for keyvaluestore experimental feature 
Don't list keyvaluestore as a valid type if feature not enabled

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
David Zafman
cfca6835bd ceph-objectstore-tool: Eliminate obscure "Invalid params" error 
Will fail later with "No such file or directory" for an empty data-path
because we've already checked for vm.count("data-path")

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
David Zafman
565b413df9 ceph-objectstore-tool: Check pgid validity earlier like we did before 
This code was not doing the umount() even though it was moved after mount()

Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
David Zafman
fb42407e5f ceph-dencoder: Add ability to import from stdin by specifying "-" 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2015-05-13 13:09:11 -07:00
Loic Dachary
b98a921fc9 Merge pull request #4375 from tchaikov/wip-ceph-unrecognized-exception 
ceph.in: do not throw on unknown errno

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-05-13 21:32:02 +02:00
Michal Jarzabek
25caea8c88 buffer.h: added some consts 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2015-05-13 20:00:49 +01:00
Michal Jarzabek
1b45f2e17f buffer.h: Removed unnecessary copy constructor and assignment operator 
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2015-05-13 20:00:49 +01:00
Loic Dachary
180ed33b10 Merge pull request #4151 from dmitryya/issue_7401 
obj_bencher: status_printer waits before the first calculation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-05-13 20:00:25 +02:00
Loic Dachary
ff643caca9 Merge pull request #4552 from stiopaa1/bufferLinkage 
common/buffer.cc: change linkage of few variables to internal

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-05-13 19:57:14 +02:00
Loic Dachary
ee96791cf1 Merge pull request #4663 from dachary/wip-11598-ceph-detect-init 
ceph-detect-init: plain setup.py install on make install

Reviewed-by: Kernel Neophyte <neophyte.hacker001@gmail.com>
 2015-05-13 19:14:31 +02:00
Ken Dreyer
f9d66a816b Merge pull request #4666 from SUSE/wip-11610-next 
ceph.spec.in: include SUSE in _with_systemd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
 2015-05-13 10:06:11 -06:00