From: Nathan Cutler <presnypreklad@gmail.com>
Date: Fri, 12 Aug 2016 10:23:41 +0000 (+0200)
Subject: Merge pull request #10291 from badone/wip-13829-hammer
X-Git-Tag: v0.94.8~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da2960f974b9a64a683ac8b77faf08fda3a5d0ba;p=ceph.git

Merge pull request #10291 from badone/wip-13829-hammer

hammer: config set with negative value results in "error setting 'filestore_merge_threshold' to '-40': (22) Invalid argument"

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
---

da2960f974b9a64a683ac8b77faf08fda3a5d0ba
diff --cc qa/workunits/cephtool/test.sh
index a930450f037,d13c222820a..bee9374ff61
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@@ -1578,9 -1560,9 +1584,10 @@@ MON_TESTS+=" mon_osd_misc
  MON_TESTS+=" mon_heap_profiler"
  MON_TESTS+=" mon_tell"
  MON_TESTS+=" mon_crushmap_validation"
 +MON_TESTS+=" mon_cephdf_commands"
  
  OSD_TESTS+=" osd_bench"
+ OSD_TESTS+=" osd_negative_filestore_merge_threshold"
  OSD_TESTS+=" tiering_agent"
  
  MDS_TESTS+=" mds_tell"