Fix warning and add rack to cluster nodes

confluentinc · Sep 21, 2023 · 74d98dc · 74d98dc
1 parent fd14d24
commit 74d98dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/examples/describe_cluster.c b/examples/describe_cluster.c
@@ -169,9 +169,9 @@ print_cluster_info(const rd_kafka_DescribeCluster_result_t *clusterdesc) {
                 const rd_kafka_Node_t *node = nodes[j];
                 printf("Node [id: %" PRId32
                        ", host: %s"
-                       ", port: %" PRIu16 "]\n",
+                       ", port: %" PRIu16 ", rack: %s]\n",
                        rd_kafka_Node_id(node), rd_kafka_Node_host(node),
-                       rd_kafka_Node_port(node));
+                       rd_kafka_Node_port(node), rd_kafka_Node_rack(node));
         }
         return 0;
 }

diff --git a/src/rdkafka_admin.c b/src/rdkafka_admin.c
@@ -8410,9 +8410,9 @@ rd_kafka_ClusterDescription_new(const rd_kafka_metadata_internal_t *mdi) {
             rd_calloc(clusterdesc->node_cnt, sizeof(rd_kafka_Node_t *));
 
         for (i = 0; i < md->broker_cnt; i++)
-                clusterdesc->nodes[i] =
-                    rd_kafka_Node_new(md->brokers[i].id, md->brokers[i].host,
-                                      md->brokers[i].port, NULL);
+                clusterdesc->nodes[i] = rd_kafka_Node_new_from_brokers(
+                    md->brokers[i].id, mdi->brokers_sorted, mdi->brokers,
+                    md->broker_cnt);
 
         return clusterdesc;
 }

diff --git a/src/rdkafka_aux.h b/src/rdkafka_aux.h
@@ -108,7 +108,7 @@ typedef struct rd_kafka_Node_s {
         int id;        /*< Node id */
         char *host;    /*< Node host */
         uint16_t port; /*< Node port */
-        char *rack     /*< (optional) Node rack id */
+        char *rack;    /*< (optional) Node rack id */
 } rd_kafka_Node_t;
 
 rd_kafka_Node_t *rd_kafka_Node_new(int32_t id,