summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Makefile: fix /sbin vs /usr/sbin behaviorwip-6456Sage Weil2013-10-154-5/+8
| | | | | | | | | | | | Instead of telling configure to put things in /sbin, explicitly put the two important items (mkcephfs and mount.fuse.ceph) in /sbin via an automake rule. This unbreaks FreeBSD 9.1 and probably others. Based on patches originally from Alan Somers <asomers@gmail.com>, modified for the current Makefile structure and applied to the specfile too. Fixes: #6456 Signed-off-by: Sage Weil <sage@inktank.com>
* Merge pull request #723 from ceph/wip-6334Sage Weil2013-10-151-6/+2
|\ | | | | | | | | common: don't do special things for unprivileged daemons Reviewed-by: Greg Farnum <greg@inktank.com>
| * common: don't do special things for unprivileged daemonsSage Weil2013-10-151-6/+2
|/ | | | | | | | We generally do want an admin socket and log, and people usually run these as root. This is more confusing than useful. Fixes: #6334 Signed-off-by: Sage Weil <sage@inktank.com>
* mon, osd: send leveldb log to /dev/null by defaultSage Weil2013-10-151-2/+2
| | | | | Fixes: #5175 Signed-off-by: Sage Weil <sage@inktank.com>
* Merge pull request #542 from ceph/wip-6122Sage Weil2013-10-151-3/+6
|\ | | | | test/librados/cmd.cc: tolerate thrashing on pg_command tests
| * test/librados/cmd.cc: tolerate thrashing on pg_command testswip-6122Sage Weil2013-08-261-3/+6
| | | | | | | | | | | | | | | | We may get ENXIO (osd down) or ENOENT (pg dne (yet) on the target osd) if there is thrashing going on. Fixes: #6122 Signed-off-by: Sage Weil <sage@inktank.com>
* | doc: Update from user feedback. Needed to enable S3/Keystone.John Wilkins2013-10-151-0/+1
| | | | | | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* | os/FileStore: fix fiemap double-free(s)Alan Somers2013-10-152-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If GenericFileStoreBackend::do_fiemap returns anything other than 0, then fiemap will not be allocated. However, GenericFileStoreBackend::detect_features will free fiemap regardless, triggering an assertion in tcmalloc. The attached patch will fix the bug by only freeing fiemap when necessary. In my case, do_fiemap returns -ENOSYS because fiemap is not implemented on FreeBSD. However, this bug could also happen on Linux when do_fiemap returns -ENOMEM. Fixes: #6504 Signed-off-by: Alan Somers <asomers@gmail.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | ceph-dencoder: select_generated() should properly validate its inputAlan Somers2013-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If m_list.size() == 0, then calling select_generated(0) will result in uninitialized data being assigned to m_object, which will cause a segfault down the road. This patch fixes that. To Reproduce: $ ceph-dencoder type MWatchNotify select_test 0 encode decode Segmentation fault (core dumped) After the patch: $ ./ceph-dencoder type MWatchNotify select_test 0 encode decode error: invalid id for generated object $ echo $? 1 Fixes: #6510 Signed-off-by: Alan Somers <asomers@gmail.com>
* | vstart.sh: create dev/ automaticallySage Weil2013-10-151-1/+2
| | | | | | | | | | | | | | | | | | Otherwise you have to explicitly create it on a new checkout. Also mkdir -p for consistency, tho it's not needed if dev/ is already there. Signed-off-by: Sage Weil <sage@inktank.com>
* | Merge pull request #706 from ceph/wip-6059Sage Weil2013-10-154-40/+245
|\ \ | | | | | | | | | | | | | | | Wip 6059 Partly-reviewed-by: Greg Farnum <greg@inktank.com> Partly-reviewed-by: Sage Weil <sage@inktank.com>
| * | ReplicatedPG.h: while there cannot be a read in progress, there may be a ↵Samuel Just2013-10-131-1/+0
| | | | | | | | | | | | | | | | | | read blocked Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: remove unused RWTracker::ObjState::clearSamuel Just2013-10-101-7/+0
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: remove the other backfill related flushesSamuel Just2013-10-092-17/+25
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | RadosModel: send racing read on writeSamuel Just2013-10-091-0/+26
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: block reads on an object until the write is committedSamuel Just2013-10-092-23/+202
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
* | | Merge pull request #717 from dachary/masterSage Weil2013-10-151-9/+4
|\ \ \ | | | | | | | | | | | | | | | | mon: osd pool set syntax relaxed, modify unit tests Reviewed-by: Sage Weil <sage@inktank.com>
| * | | mon: osd pool set syntax relaxed, modify unit testsLoic Dachary2013-10-151-9/+4
|/ / / | | | | | | | | | | | | | | | | | | The argument is no longer restricted to a numerical value. Another variable was added ( hashpspool ) check that it is a valid variable. Signed-off-by: Loic Dachary <loic@dachary.org>
* | | Merge remote-tracking branch 'gh/next'Sage Weil2013-10-143-2/+17
|\ \ \
| * | | rgw: swift update obj metadata also add generic attrsYehuda Sadeh2013-10-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6462 We were missing the generic attributes when we updated the object metadata (operation that only exists in the swift api). Reviewed-by: Josh Durgin <josh.durgin@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | Merge branch 'wip-6444' into nextYehuda Sadeh2013-10-112-2/+10
| |\ \ \ | | | | | | | | | | | | | | | Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| | * | | librados: add some clarifying commentsYehuda Sadeh2013-10-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about async pool operation handle Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| | * | | librados: drop reference to completion in container destructorYehuda Sadeh2013-10-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the PoolAsyncCompletionImpl reference drop from C_PoolAsync_Safe::finish() to ~C_PoolAsyncSafe(), as finish() is only called when the async request is actually sent. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| * | | | Go back to $PWD in fsstress.sh if compiling from source.Sandon Van Ness2013-10-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although fsstress was being called with a static path the directory it was writing to was in the current directory so doing a cd to the source directory that is made in /tmp and then removing it later caused it to be unable to write the files in a non-existent dir. This change gets the current path first and cd's back into it after it is done compiling fsstress. Issue #6479. Signed-off-by: Sandon Van Ness <sandon@inktank.com> Reviewed-by: Alfredo Deza <alfredo.deza@inktank.com>
* | | | | ceph.spec.in: do not list ceph-rest-api twice; add missing cls_hello fileshuangjun2013-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: hjwsm1989@gmail.com Signed-off-by: Sage Weil <sage@inktank.com>
* | | | | Merge pull request #712 from ceph/wip-mon-pool-setSage Weil2013-10-146-70/+158
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | rework ceph osd pool set <pool> <field> <val> Reviewed-by: Sage Weil <sage@inktank.com>
| * | | | | osd/osd_types: generalize pg_pool_t::get_flags_string()Sage Weil2013-10-141-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way the method doesn't have to be modified when new flags are added. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | | osd: osd_types: Output pool's flag names during dumpwip-mon-pool-setJoao Eduardo Luis2013-10-112-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
| * | | | | mon: OSDMonitor: allow (un)setting 'hashpspool' flag via 'osd pool set'Joao Eduardo Luis2013-10-113-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
| * | | | | mon: OSDMonitor: split 'osd pool set' out of 'prepare_command'Joao Eduardo Luis2013-10-113-68/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should start doing this across the whole 'prepare_command' function. Makes it prettier to the reader, and easier to add new code. Change the command to send a string instead of an int to allow us to have non-integer pool paramters that can be modified. Support input json with both int and string values so that we work with all flavors of client. Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
* | | | | | Merge pull request #694 from grosskur/fix-rpm-junit4Sage Weil2013-10-141-6/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceph.spec.in: Always depend on junit4 (fixes bug #6216) Reviewed-by: Loic Dachary <loic@dachary.org>
| * | | | | | ceph.spec.in: Always depend on junit4 (fixes bug #6216)Alan Grosskurth2013-10-061-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RPM spec file currently lists `junit` as a dependency on all platforms except recent versions of OpenSUSE. This is problematic because `junit` refers to version 3.x, which doesn't satisfy the check in the configure script: configure: Cannot find junit4.jar (apt-get install junit4) As a result, rpmbuild doesn't build `libcephfs-test.jar` and fails: http://tracker.ceph.com/issues/6216 So let's depend on `junit4` in all cases. This package is provided by all supported platforms (el6, fc17, fc18, fc19, opensuse12.2, opensuse12, sles11), and my testing on CentOS 6 shows that rpmbuild now succeeds and produces the expected `libcephfs_jni1` RPM.
* | | | | | | Merge branch 'wip-rgw-quota'Yehuda Sadeh2013-10-1422-16/+875
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/test/cli/radosgw-admin/help.t Reviewed-by: Josh Durgin <josh.durgin@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | radosgw-admin: add --quota-scope param to usageYehuda Sadeh2013-10-142-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and also look at it when setting quota on a bucket. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: switch out param to a pointer instead of referenceYehuda Sadeh2013-10-112-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | following code review Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | test: update cli test for radosgw-adminYehuda Sadeh2013-10-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | radosgw-admin: clarify --max-size paramYehuda Sadeh2013-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | formatter: dump_bool dumps unquoted stringsYehuda Sadeh2013-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw_quoa.{h,cc}: add copyright noticeYehuda Sadeh2013-10-112-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | radosgw-admin: limit user bucket-level quotaYehuda Sadeh2013-10-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only allow it if --quota-scope=bucket is specified. This is done in order to avoid confusion with the future user level quota command. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | radosgw-admin: can set user's bucket quotaYehuda Sadeh2013-10-103-33/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: bucket quota thresholdYehuda Sadeh2013-10-103-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bucket quota threshold so that when we're passed that value we reread the bucket stats before every write and not rely on cached value. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: configurable bucket quota sizeYehuda Sadeh2013-10-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: protect against concurrent async quota updatesYehuda Sadeh2013-10-102-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leverage the cache lru_map locking for making sure that we don't end up with more than a single concurrent async update on the same bucket within the same update window. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: async quota updateYehuda Sadeh2013-10-106-7/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asynchronously update bucket stats when a period passed, but bucket stats are within the ttl window. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: rearrange includesYehuda Sadeh2013-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to have ceph_json.h first due to some boost weirdness. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: update cache atomicallyYehuda Sadeh2013-10-041-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new lru_map::find_and_update() to update internal cache state. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | lru_map: add find_and_update()Yehuda Sadeh2013-10-041-10/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new find_and_update() call to make atomic changes. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: init RGWBucketStatsYehuda Sadeh2013-10-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | | | | | rgw: handle negative quota as non-assigned valuesYehuda Sadeh2013-10-022-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that we can have a 0 as a quota value. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
View Lorry Controller Status