Merge pull request #42 from HernanRivasAcosta/hernan.quickfix.metadat…

…a_error_mishandling Fixed a parsing error for some metadata responses
HernanRivasAcosta · Sep 1, 2016 · e0866b8 · e0866b8
2 parents 52340d5 + c7f9307
commit e0866b8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/rel/kafkerl.app.config → config/sys.config b/rel/kafkerl.app.config → config/sys.config
diff --git a/relx.config b/relx.config
@@ -0,0 +1,3 @@
+{release, {kafkerl, "2.1.0"}, [kafkerl]}.
+{sys_config, "config/sys.config"}.
+{extended_start_script, true}.
diff --git a/src/kafkerl.app.src b/src/kafkerl.app.src
@@ -2,7 +2,7 @@
 , kafkerl
 , [ {description, "Apache Kafka 0.8.2 high performance producer/consumer for erlang."}
   , {vsn, "2.1.0"}
-  , {applications, [kernel, stdlib]}
+  , {applications, [kernel, validerl, epocxy, lager, stdlib]}
   , {mod, {kafkerl_app, []}}
   , {modules, [ kafkerl
               , kafkerl_app

diff --git a/src/kafkerl_protocol.erl b/src/kafkerl_protocol.erl
@@ -568,25 +568,24 @@ parse_topic_metadata(Count, <<>>, Acc) when Count =< 0 ->
 parse_topic_metadata(Count, Bin, Acc) when Count =< 0 ->
   lager:warning("Finished parsing topic metadata, ignoring bytes: ~p", [Bin]),
   {ok, lists:reverse(Acc)};
-parse_topic_metadata(Count, <<0:?SHORT,
-                              TopicSize:?USHORT,
-                              TopicName:TopicSize/binary,
+parse_topic_metadata(Count, <<ErrorCode:?SHORT,
+                              -1:?SHORT,
                               PartitionCount:?UINT,
                               PartitionsBin/binary>>, Acc) ->
   {ok, PartitionsMetadata, Remainder} = parse_partition_metadata(PartitionCount,
                                                                  PartitionsBin),
-  TopicMetadata = {0, TopicName, PartitionsMetadata},
+  TopicMetadata = {ErrorCode, <<"unknown">>, PartitionsMetadata},
   parse_topic_metadata(Count - 1, Remainder, [TopicMetadata | Acc]);
 parse_topic_metadata(Count, <<ErrorCode:?SHORT,
-                              -1:?SHORT, % TopicSize
-                              0:?UINT, % PartitionCount
-                              Remainder/binary>>, Acc) ->
-  {ok, PartitionsMetadata, Remainder} = parse_partition_metadata(0, Remainder),
-  TopicMetadata = {ErrorCode, <<"unkown">>, PartitionsMetadata},
-  parse_topic_metadata(Count - 1, Remainder, [TopicMetadata | Acc]);
-parse_topic_metadata(_Count, _Bin, _Acc) ->
-  {error, bad_binary}.
-
+                              TopicSize:?USHORT,
+                              TopicName:TopicSize/binary,
+                              PartitionCount:?UINT,
+                              PartitionsBin/binary>>, Acc) ->
+  {ok, PartitionsMetadata, Remainder} = parse_partition_metadata(PartitionCount,
+                                                                 PartitionsBin),
+  TopicMetadata = {ErrorCode, TopicName, PartitionsMetadata},
+  parse_topic_metadata(Count - 1, Remainder, [TopicMetadata | Acc]).
+  
 parse_partition_metadata(Count, Bin) ->
   parse_partition_metadata(Count, Bin, []).