Don't try to resolve siblings in supercluster

Because it will results in notfound error, almost, in vein.

riak_test/tests/sibling_benchmark.erl

@@ -104,9 +104,13 @@ confirm() ->
     %% Just test sibling resolver, for a major case of manifests
     RawManifestBucket = rc_helper:to_riak_bucket(objects, ?TEST_BUCKET),
     RawKey = ?KEY_SINGLE_BLOCK,
-    R0 = rpc:call(hd(CSNodes), riak_cs_console, resolve_siblings,
-                  [RawManifestBucket, RawKey]),
-    ?assertEqual(ok, R0),
+    case rpc:call(hd(CSNodes), riak_cs_console, resolve_siblings,
+                  [RawManifestBucket, RawKey]) of
+        ok -> ok;
+        {error, not_supported} ->
+            _ = lager:info("resolve_siblings does not suport multibag yet, skip it"),
+            ok
+    end,
 
     %% tearing down the stage
     erlcloud_s3:delete_object(?TEST_BUCKET, ?KEY_SINGLE_BLOCK, UserConfig),

src/riak_cs_console.erl

@@ -187,12 +187,17 @@ cleanup_orphan_multipart(Timestamp) when is_binary(Timestamp) ->
 
 -spec resolve_siblings(binary(), binary()) -> any().
 resolve_siblings(RawBucket, RawKey) ->
-    {ok, RcPid} = riak_cs_riak_client:start_link([]),
-    try
-        {ok, Pid} = riak_cs_riak_client:master_pbc(RcPid),
-        resolve_siblings(Pid, RawBucket, RawKey)
-    after
-        riak_cs_riak_client:stop(RcPid)
+    case riak_cs_config:is_multibag_enabled() of
+        true ->
+            {error, not_supported};
+        false ->
+            {ok, RcPid} = riak_cs_riak_client:start_link([]),
+            try
+                {ok, Pid} = riak_cs_riak_client:master_pbc(RcPid),
+                resolve_siblings(Pid, RawBucket, RawKey)
+            after
+                riak_cs_riak_client:stop(RcPid)
+            end
     end.
 
 %% @doc Resolve siblings as quick operation. Assuming login via