Joao Eduardo Luis
35c80951ca
Merge pull request #4896 from xinxinsh/wip-monitor-dump-transaction
...
MonitorDBStore : make monitor transaction more readable
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-31 10:17:58 +01:00
Kefu Chai
f8f33bcaa6
Merge pull request #5024 from xinxinsh/wip-12018
...
make rbd and pool quota work
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-08-31 12:11:09 +08:00
Kefu Chai
0e8ade1b64
Merge pull request #5448 from kylinstorage/wip-optimize-agent_choose_mode
...
osd: avoid unnecessary calculation in agent_choose_mode()
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-31 12:10:00 +08:00
Kefu Chai
247163570a
Merge pull request #5418 from branch-predictor/bp-remove-str-concat
...
osd/osd_types.cc: get rid of str concat when making hash key
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-31 12:08:46 +08:00
Kefu Chai
09464ec6b7
Merge pull request #5570 from dachary/wip-12673-proxy-read
...
osd: trigger the cache agent after a promotion
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-31 12:04:59 +08:00
Kefu Chai
5462635167
Merge pull request #5710 from tchaikov/wip-check-boost_random-mt
...
configure.ac: check for libboost_random-mt also
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-29 22:32:20 +08:00
Sage Weil
4b07af0adf
Merge pull request #5711 from dachary/wip-12781-dmcrypt
...
ceph-disk: fix dmcrypt typo
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-29 08:24:01 -04:00
Loic Dachary
3a6c2468dd
ceph-disk: fix dmcrypt typo
...
Fix the typo introduced by 29431944c7
http://tracker.ceph.com/issues/12781 Fixes : #12781
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-08-29 11:31:49 +02:00
Loic Dachary
898ebf01fb
Merge pull request #4731 from stiopaa1/cephdetectinitfix
...
ceph-detect-init/debian/__init__: improved syntax
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-29 11:03:02 +02:00
Loic Dachary
b5af9e1894
Merge pull request #5503 from zhouyuan/isal_2.14_update
...
erasure-code: Update ISA-L to 2.14
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-29 10:58:12 +02:00
Kefu Chai
9b815ed894
configure.ac: check for libboost_random-mt also
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-29 16:49:57 +08:00
Loic Dachary
3404bb90dd
Merge pull request #5467 from dachary/wip-ceph-release-notes
...
tools: ceph-release-notes unicode handling
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-08-29 10:47:26 +02:00
Samuel Just
788c5584a0
Merge pull request #5333 from ceph/wip-12437
...
osd: Keep a reference count on Connection while calling send_mes…
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-28 14:49:15 -07:00
Sage Weil
bbe9f577d9
Merge remote-tracking branch 'gh/infernalis'
2015-08-28 15:20:04 -04:00
Sage Weil
cbaac86f37
Merge pull request #5690 from dzafman/wip-pgls-zafman
...
cls: Fix successful return found by compiler warning
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 13:19:23 -04:00
Sage Weil
8534ae6dd4
Merge pull request #5704 from tchaikov/wip-adventure-mode
...
common: 'enable experimental data corrupting features' now understand '*'
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 12:20:18 -04:00
Samuel Just
6d5d07267a
Merge pull request #5667 from liewegas/wip-9221
...
ceph_test_rados_api_tier: make PromoteOn2ndRead tolerate thrashing
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-28 09:18:16 -07:00
Samuel Just
d75824d9ef
Merge pull request #5666 from liewegas/wip-12785
...
osd: fix off-by-one in hobject_t::is_temp() (bug 12785)
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-28 09:17:54 -07:00
Kefu Chai
a895982066
common: 'enable experimental data corrupting features' now understands '*'
...
'*' allows any feature.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-29 00:15:01 +08:00
Sage Weil
c2a9641c96
Merge pull request #5609 from rohanmars/wip-timegm
...
added boost timegm impl for cross platform support
In the future it would be nice to avoid duplication of the code in each compiled module, but this works for now. The only real user right now is rgw.
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 12:14:41 -04:00
Sage Weil
4c00183996
Merge pull request #5627 from wonzhq/agent-work
...
osd: do evict before flush in agent_work
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 12:13:57 -04:00
Sage Weil
620c4177ea
Merge pull request #5640 from liewegas/wip-mutex-lock
...
mutex: avoid trylock unless instrumentation is enabled
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-08-28 12:13:38 -04:00
Sage Weil
7942db555f
Merge pull request #5656 from XinzeChi/wip-buffer-emtpyptr
...
common: fix insert empty ptr when bufferlist rebuild
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 12:12:45 -04:00
Kefu Chai
9c86b8e699
Merge pull request #5453 from wonzhq/recover-primary
...
osd: recovery fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 23:45:25 +08:00
Kefu Chai
2b17da399b
Merge pull request #5415 from wonzhq/do-recovery
...
osd: do_recovery cleanup
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-28 23:40:41 +08:00
Sage Weil
4a3454358a
Merge pull request #5703 from ceph/wip-boost-random-cmake
...
CMake: update for boost_random
2015-08-28 11:14:31 -04:00
John Spray
a3fc6e8356
CMake: update for boost_random
...
This became a dependency in dbcaa544
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-28 15:34:12 +01:00
Loic Dachary
34411efad5
Merge pull request #5701 from guce/h3c_mail_organization_map
...
h3c mail organization map
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-28 12:23:19 +02:00
guce
e92d2f38c5
h3c mail organization map
...
update .mailmap and .organizationmap for h3c organization
Signed-off-by: Ce Gu <guce@h3c.com>
2015-08-28 17:56:34 +08:00
Kefu Chai
52bc4886b7
Merge pull request #5114 from branch-predictor/bp-reduced-memzero
...
ObjectStore/FileJournal: reduce impact of memset()
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-28 10:08:56 +08:00
David Zafman
a9c1601e8a
cls: Fix successful return found by compiler warning
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-08-27 16:21:50 -07:00
David Zafman
0a7c4e390b
Merge pull request #5688 from dzafman/wip-decode-zafman
...
osd: Decode use_gmt_hitset with a unique version
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 12:58:47 -07:00
Samuel Just
46e7f36785
Merge pull request #5679 from wonzhq/store-test
...
test: disable newstore test until it's merged
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-27 11:59:49 -07:00
David Zafman
2bc5a48f4c
osd: Decode use_gmt_hitset with a unique version
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-08-27 11:25:00 -07:00
John Spray
60e58b010c
Merge pull request #5545 from ceph/wip-objclass-filters
...
Allow object classes to define PGLS filters
Reviewed-by: David Zafman <dzafman@redhat.com>
2015-08-27 18:14:37 +01:00
Sage Weil
cbe101e7db
Merge remote-tracking branch 'gh/wip-osd-compat'
...
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-27 13:05:40 -04:00
Sage Weil
68d1d8ee38
Merge pull request #5683 from tchaikov/wip-hitset-gmt-yet-another-feature-bit
...
osd: do not let OSD_HITSET_GMT reuse the feature bit
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 12:41:54 -04:00
Kefu Chai
5a4f6a866b
osd: do not let OSD_HITSET_GMT reuse the feature bit
...
* to ease the backport to hammer
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-08-28 00:39:12 +08:00
Joao Eduardo Luis
f1e1ada768
Merge pull request #5524 from tchaikov/wip-monstore-cache
...
mon: add a cache layer over MonitorDBStore
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 16:21:16 +01:00
Sage Weil
cba062e4a8
Merge pull request #5669 from yuyuyu101/wip-12745
...
ms/simple: Messenger/MessengerTest.SyntheticInjectTest2/1 hang
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-27 10:10:55 -04:00
Sage Weil
3eb36fc732
doc/release-notes: v0.94.3
...
Fix up the release timeline link for v9.0.3 too.
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-27 10:06:07 -04:00
John Spray
f5df1e4884
osd: separate filter init from construction
...
...so that implementations can readily handle
decode errors in client args and return an
error code.
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
John Spray
2777438b36
test: add a test for filter in cls hello
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
John Spray
60d51fc4a9
cls: add a filter to the hello class for testing
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
John Spray
e749b214e7
objclass: enable unregistering filter factory
...
Signed-off-by: John Spray <john.spray@redhat.com>
2015-08-27 14:13:46 +01:00
Haomai Wang
328d30cb78
AsyncConnection: Fix uninitialized variable compile warning
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-27 16:53:17 +08:00
Haomai Wang
24f4d22d21
TestMsgr: Fix forever hang under lossless policy and one is WAIT another down
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-27 16:53:15 +08:00
Orit Wasserman
e05e35b782
Merge pull request #5678 from ceph/wip-12208
...
rgw: delete finisher only after finalizing watches
2015-08-27 10:40:23 +02:00
Orit Wasserman
edbb22f027
Merge pull request #5677 from ceph/wip-11455
...
rgw: init some manifest fields when handling explicit objs
2015-08-27 10:39:47 +02:00
Orit Wasserman
7515c04716
Merge pull request #5651 from theanalyst/rgw/fixiso8601
...
rgw: be more flexible with iso8601 timestamps
2015-08-27 10:38:36 +02:00