Merge branch 'master' into daemon-spaces

1 files changed, 12 insertions, 6 deletions

diff --git a/src/couch/src/couch_compaction_daemon.erl b/src/couch/src/couch_compaction_daemon.erl
index 5c278aaf6..72d5a17e2 100644
--- a/src/couch/src/couch_compaction_daemon.erl
+++ b/src/couch/src/couch_compaction_daemon.erl
@@ -300,16 +300,22 @@ compact_time_left(#config{period = #period{to = {ToH, ToM} = To}}) ->
     end.
 
 
-get_db_config(DbName) ->
-    case ets:lookup(?CONFIG_ETS, DbName) of
+get_db_config(ShardName) ->
+    case ets:lookup(?CONFIG_ETS, ShardName) of
     [] ->
-        case ets:lookup(?CONFIG_ETS, <<"_default">>) of
+        DbName = mem3:dbname(ShardName),
+        case ets:lookup(?CONFIG_ETS, DbName) of
         [] ->
-            nil;
-        [{<<"_default">>, Config}] ->
+            case ets:lookup(?CONFIG_ETS, <<"_default">>) of
+            [] ->
+                nil;
+            [{<<"_default">>, Config}] ->
+                {ok, Config}
+            end;
+        [{DbName, Config}] ->
             {ok, Config}
         end;
-    [{DbName, Config}] ->
+    [{ShardName, Config}] ->
         {ok, Config}
     end.