From: Loic Dachary <loic-201408@dachary.org>
Date: Fri, 29 Aug 2014 21:25:34 +0000 (+0200)
Subject: erasure-code: preload LRC plugin
X-Git-Tag: v0.86~161^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d20432ecc0b013638317951ce41dbf325155e27f;p=ceph.git

erasure-code: preload LRC plugin

Add LRC to the list of erasure code plugins preloaded by default.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
---

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index e344fc17a7ce..008c89be77d3 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -454,6 +454,7 @@ OPTION(osd_pool_default_erasure_code_profile,
        ) // default properties of osd pool create
 OPTION(osd_erasure_code_plugins, OPT_STR,
        "jerasure"
+       " lrc"
 #ifdef HAVE_BETTER_YASM_ELF64
        " isa"
 #endif
diff --git a/src/test/erasure-code/test-erasure-code.sh b/src/test/erasure-code/test-erasure-code.sh
index 6c438e616c3d..50ba71dce19e 100755
--- a/src/test/erasure-code/test-erasure-code.sh
+++ b/src/test/erasure-code/test-erasure-code.sh
@@ -29,13 +29,13 @@ function run() {
     run_mon $dir a --public-addr 127.0.0.1 || return 1
     # check that erasure code plugins are preloaded
     CEPH_ARGS='' ./ceph --admin-daemon $dir/a/ceph-mon.a.asok log flush || return 1
-    grep 'load: jerasure' $dir/a/log || return 1
+    grep 'load: jerasure.*lrc' $dir/a/log || return 1
     for id in $(seq 0 10) ; do
         run_osd $dir $id || return 1
     done
     # check that erasure code plugins are preloaded
     CEPH_ARGS='' ./ceph --admin-daemon $dir/ceph-osd.0.asok log flush || return 1
-    grep 'load: jerasure' $dir/osd-0.log || return 1
+    grep 'load: jerasure.*lrc' $dir/osd-0.log || return 1
     create_erasure_coded_pool ecpool || return 1
     FUNCTIONS=${FUNCTIONS:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
     for TEST_function in $FUNCTIONS ; do