Merge pull request ceph#61674 from connorfawcett/wip-ec-default-fixes

erasure-code: Set reed_sol_van to be the default technique for Jerasure if none is specified.

Author: NitzanMordhai

qa/standalone/ceph-helpers.sh

@@ -2100,7 +2100,6 @@ function test_wait_for_scrub() {
 # @param plugin erasure code plugin
 # @return 0 on success, 1 on error
 #
-
 function erasure_code_plugin_exists() {
     local plugin=$1
     local status
@@ -2115,10 +2114,13 @@ function erasure_code_plugin_exists() {
     local status=$?
     if [ $status -eq 0 ]; then
         ceph osd erasure-code-profile rm TESTPROFILE
-    elif ! echo $s | grep --quiet "$grepstr" ; then
+    elif echo $s | grep --quiet "$grepstr" ; then
+        # expected error when the plugin doesn't exist
         status=1
-        # display why the string was rejected.
+    else
+        # any other error means plugin exists but can't initialize
         echo $s
+        status=0
     fi
     return $status
 }

src/erasure-code/jerasure/ErasureCodePluginJerasure.cc

@@ -39,7 +39,7 @@ int ErasureCodePluginJerasure::factory(const std::string& directory,
     std::string t;
     if (profile.find("technique") != profile.end())
       t = profile.find("technique")->second;
-    if (t == "reed_sol_van") {
+    if (t == "reed_sol_van" || t == "") { // Default!
       interface = new ErasureCodeJerasureReedSolomonVandermonde();
     } else if (t == "reed_sol_r6_op") {
       interface = new ErasureCodeJerasureReedSolomonRAID6();

src/test/erasure-code/TestErasureCodePluginJerasure.cc

@@ -28,8 +28,9 @@ using namespace std;
 TEST(ErasureCodePlugin, factory)
 {
   ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance();
-  ErasureCodeProfile profile;
   {
+    ErasureCodeProfile profile;
+    profile["technique"] = "doesnotexist";
     ErasureCodeInterfaceRef erasure_code;
     EXPECT_FALSE(erasure_code);
     EXPECT_EQ(-ENOENT, instance.factory("jerasure",