try code:load_file if loading with code:ensure_loaded fails

ensure_loaded fails if our code server is in embedded mode.
basho · Jun 21, 2021 · b445a6d · b445a6d
1 parent 9066933
commit b445a6d
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/riak_kv_app.erl b/src/riak_kv_app.erl
@@ -126,11 +126,20 @@ start(_Type, _StartArgs) ->
     %% Check the storage backend
     StorageBackend = app_helper:get_env(riak_kv, storage_backend),
     case code:ensure_loaded(StorageBackend) of
-        {error,nofile} ->
-            lager:critical("storage_backend ~p is non-loadable.",
-                           [StorageBackend]),
+        {error, embedded} ->
+            case code:load_file(StorageBackend) of
+                {error, LoadReason} ->
+                    lager:critical("storage_backend ~p is non-loadable: ~p.",
+                                   [StorageBackend, LoadReason]),
+                    throw({error, invalid_storage_backend});
+                {module, _} ->
+                    ok
+            end;
+        {error, EnsureReason} ->
+            lager:critical("storage_backend ~p is non-loadable: ~p.",
+                           [StorageBackend, EnsureReason]),
             throw({error, invalid_storage_backend});
-        _ ->
+        {module, _} ->
             ok
     end,