Refine warning log and code comment

riak_test/tests/gc_tests.erl

@@ -116,8 +116,9 @@ verify_gc_run(Node, GCKey) ->
     rtcs:gc(1, "batch"),
     true = rt:expect_in_log(Node,
                             "Invalid state manifest in GC bucket at <<\""
-                            ++ binary_to_list(GCKey)
-                            ++ "\">>: "),
+                            ++ binary_to_list(GCKey) ++ "\">>, "
+                            ++ "bucket=<<\"" ++ ?TEST_BUCKET ++ "\">> "
+                            ++ "key=<<\"" ++ ?TEST_KEY_BAD_STATE ++ "\">>: "),
     true = rt:expect_in_log(Node,
                             "Finished garbage collection: \\d+ seconds, "
                             "\\d batch_count, 0 batch_skips, "

src/riak_cs_delete_fsm.erl

@@ -175,12 +175,17 @@ handle_receiving_manifest(State=#state{manifest=Manifest,
                                    total_blocks=BlockCount},
             start_block_servers(NewState);
         {error, invalid_state} ->
-            _ = lager:warning("Invalid state manifest in GC bucket at ~p: ~p",
-                              [GCKey, Manifest]),
+            {Bucket, Key} = Manifest?MANIFEST.bkey,
+            _ = lager:warning("Invalid state manifest in GC bucket at ~p, "
+                              "bucket=~p key=~p: ~p",
+                              [GCKey, Bucket, Key, Manifest]),
             %% If total blocks and deleted blocks are the same,
             %% gc worker attempt to delete the manifest in fileset.
             %% Then manifests and blocks becomes orphan.
             %% To avoid it, set total_blocks > 0 here.
+            %% For now delete FSM stops with pseudo-normal termination to
+            %% let other valid manifests be collected, as the root cause
+            %% of #827 is still unidentified.
             {stop, normal, State#state{total_blocks=1}}
     end.