fix 1.15 base image build (#6190)

Signed-off-by: clyi <clyi@alauda.io>

Author: changluyi

dist/images/Dockerfile.base

@@ -118,7 +118,7 @@ RUN cd /usr/src/ && git clone -b branch-25.03 --depth=1 https://github.com/ovn-o
     git apply $SRC_DIR/03e35ed9c5b4de0fa8acbc2c057cdd5957a8d605.patch && \
 	# skip node local dns ip conntrack when set acl
     git apply $SRC_DIR/e7d3ba53cdcbc524bb29c54ddb07b83cc4258ed7.patch && \
-	# loadbalancer select local backend first
+	# loadbalancer select local backend first tmp
     git apply $SRC_DIR/9286e1fd578fdb8f565a0f4aa9066b538295e1ac.patch && \
     # fix lr-lb dnat with multiple distributed gateway ports
     git apply $SRC_DIR/e5916eb53abc3b7d28c407c3c47566c46116090a.patch && \

dist/images/patches/9286e1fd578fdb8f565a0f4aa9066b538295e1ac.patch

@@ -1,18 +1,18 @@
-From 9d26772725a18ac5fb5f7a6e22cb80d53383e4c9 Mon Sep 17 00:00:00 2001
+From fe95c6134f3827adf6017a95c8b8ec2a01a77902 Mon Sep 17 00:00:00 2001
 From: clyi <clyi@alauda.io>
-Date: Thu, 15 Jan 2026 10:30:05 +0800
+Date: Thu, 22 Jan 2026 10:41:30 +0800
 Subject: [PATCH] add select local lb backend
 
 Signed-off-by: clyi <clyi@alauda.io>
 ---
- northd/lb.c     |  34 ++++++++++++
+ northd/lb.c     |  34 +++++++++++
  northd/lb.h     |   1 +
- northd/northd.c | 144 +++++++++++++++++++++++++++++++++++++++++++++---
+ northd/northd.c | 146 +++++++++++++++++++++++++++++++++++++++++++++---
  northd/northd.h |  10 ++++
- 4 files changed, 182 insertions(+), 7 deletions(-)
+ 4 files changed, 184 insertions(+), 7 deletions(-)
 
 diff --git a/northd/lb.c b/northd/lb.c
-index af0c92954..f0771b88e 100644
+index ef92249ce..f64a64cff 100644
 --- a/northd/lb.c
 +++ b/northd/lb.c
 @@ -150,6 +150,36 @@ ovn_lb_vip_backends_health_check_init(const struct ovn_northd_lb *lb,
@@ -61,7 +61,7 @@ index af0c92954..f0771b88e 100644
      uint32_t affinity_timeout =
          smap_get_uint(&nbrec_lb->options, "affinity_timeout", 0);
      if (affinity_timeout > UINT16_MAX) {
-@@ -337,6 +369,8 @@ ovn_northd_lb_init(struct ovn_northd_lb *lb,
+@@ -340,6 +372,8 @@ ovn_northd_lb_init(struct ovn_northd_lb *lb,
 
          if (lb_vip_nb->lb_health_check) {
              ovn_lb_vip_backends_health_check_init(lb, lb_vip, lb_vip_nb);
@@ -71,7 +71,7 @@ index af0c92954..f0771b88e 100644
      }
 
 diff --git a/northd/lb.h b/northd/lb.h
-index aa6616af4..c7a9ba90b 100644
+index 4696b4d98..4aa9e665f 100644
 --- a/northd/lb.h
 +++ b/northd/lb.h
 @@ -65,6 +65,7 @@ struct ovn_northd_lb {
@@ -83,10 +83,10 @@ index aa6616af4..c7a9ba90b 100644
 
      struct sset ips_v4;
 diff --git a/northd/northd.c b/northd/northd.c
-index f6559c240..918016123 100644
+index 7e8616df0..31fb61c10 100644
 --- a/northd/northd.c
 +++ b/northd/northd.c
-@@ -3747,7 +3747,9 @@ build_lb_vip_actions(const struct ovn_northd_lb *lb,
+@@ -3748,7 +3748,9 @@ build_lb_vip_actions(const struct ovn_northd_lb *lb,
                       struct ds *skip_snat_action,
                       struct ds *force_snat_action,
                       bool ls_dp,
@@ -97,7 +97,7 @@ index f6559c240..918016123 100644
  {
      bool reject = !lb_vip->n_backends && lb_vip->empty_backend_rej;
      bool drop = !lb_vip->n_backends && !lb_vip->empty_backend_rej;
-@@ -3771,6 +3773,12 @@ build_lb_vip_actions(const struct ovn_northd_lb *lb,
+@@ -3772,6 +3774,12 @@ build_lb_vip_actions(const struct ovn_northd_lb *lb,
              struct ovn_northd_lb_backend *backend_nb =
                  &lb_vip_nb->backends_nb[i];
 
@@ -110,7 +110,7 @@ index f6559c240..918016123 100644
              if (!backend_nb->health_check) {
                  continue;
              }
-@@ -3804,8 +3812,11 @@ build_lb_vip_actions(const struct ovn_northd_lb *lb,
+@@ -3805,8 +3813,11 @@ build_lb_vip_actions(const struct ovn_northd_lb *lb,
          drop = !n_active_backends && !lb_vip->empty_backend_rej;
          reject = !n_active_backends && lb_vip->empty_backend_rej;
      } else {
@@ -124,7 +124,7 @@ index f6559c240..918016123 100644
      }
 
      if (reject) {
-@@ -8233,7 +8244,8 @@ build_lb_rules(struct lflow_table *lflows, struct ovn_lb_datapaths *lb_dps,
+@@ -8234,7 +8245,8 @@ build_lb_rules(struct lflow_table *lflows, struct ovn_lb_datapaths *lb_dps,
                 const struct ovn_datapaths *ls_datapaths,
                 struct ds *match, struct ds *action,
                 const struct shash *meter_groups,
@@ -134,7 +134,7 @@ index f6559c240..918016123 100644
  {
      const struct ovn_northd_lb *lb = lb_dps->lb;
      for (size_t i = 0; i < lb->n_vips; i++) {
-@@ -8244,13 +8256,127 @@ build_lb_rules(struct lflow_table *lflows, struct ovn_lb_datapaths *lb_dps,
+@@ -8245,13 +8257,129 @@ build_lb_rules(struct lflow_table *lflows, struct ovn_lb_datapaths *lb_dps,
 
          ds_clear(action);
          ds_clear(match);
@@ -210,7 +210,7 @@ index f6559c240..918016123 100644
 +                bool build_non_meter = false;
 +                if (reject) {
 +                    size_t index;
- 
++
 +                    dp_non_meter = bitmap_clone(lb_dps->nb_ls_map,
 +                                                ods_size(ls_datapaths));
 +                    BITMAP_FOR_EACH_1 (index, ods_size(ls_datapaths),
@@ -245,13 +245,15 @@ index f6559c240..918016123 100644
 +            HMAP_FOR_EACH_SAFE (entry, next, hmap_node, &chassis_lsp_map) {
 +                free(entry->lp_array);
 +                free(entry->backend_ips);
++                sset_destroy(&entry->logical_ports);
 +                free(entry);
 +            }
 +            hmap_destroy(&chassis_lsp_map);
 +        }
 +
 +        ds_clear(match);
 +        ds_clear(action);
+ 
          /* New connections in Ingress table. */
          const char *meter = NULL;
          bool reject = build_lb_vip_actions(lb, lb_vip, lb_vip_nb, action,
@@ -263,7 +265,7 @@ index f6559c240..918016123 100644
 
          ds_put_format(match, "ct.new && %s.dst == %s", ip_match,
                        lb_vip->vip_str);
-@@ -12252,7 +12378,7 @@ build_lrouter_nat_flows_for_lb(
+@@ -12329,7 +12457,7 @@ build_lrouter_nat_flows_for_lb(
      bool reject = build_lb_vip_actions(lb, lb_vip, vips_nb, action,
                                         lb->selection_fields, &skip_snat_act,
                                         &force_snat_act, false,
@@ -272,40 +274,40 @@ index f6559c240..918016123 100644
 
      /* Higher priority rules are added for load-balancing in DNAT
       * table.  For every match (on a VIP[:port]), we add two flows.
-@@ -12410,6 +12536,7 @@ build_lswitch_flows_for_lb(struct ovn_lb_datapaths *lb_dps,
+@@ -12486,6 +12614,7 @@ build_lswitch_flows_for_lb(struct ovn_lb_datapaths *lb_dps,
                             const struct shash *meter_groups,
                             const struct ovn_datapaths *ls_datapaths,
                             const struct hmap *svc_monitor_map,
 +                           struct hmap *ls_ports,
                             struct ds *match, struct ds *action)
  {
      if (!lb_dps->n_nb_ls) {
-@@ -12453,7 +12580,7 @@ build_lswitch_flows_for_lb(struct ovn_lb_datapaths *lb_dps,
+@@ -12529,7 +12658,7 @@ build_lswitch_flows_for_lb(struct ovn_lb_datapaths *lb_dps,
       * REGBIT_CONNTRACK_COMMIT. */
      build_lb_rules_pre_stateful(lflows, lb_dps, ls_datapaths, match, action);
      build_lb_rules(lflows, lb_dps, ls_datapaths, match, action,
 -                   meter_groups, svc_monitor_map);
 +                   meter_groups, svc_monitor_map, ls_ports);
  }
 
- /* If there are any load balancing rules, we should send the packet to
-@@ -17924,6 +18051,7 @@ build_lflows_thread(void *arg)
+ static void
+@@ -18042,6 +18171,7 @@ build_lflows_thread(void *arg)
                                                 lsi->meter_groups,
                                                 lsi->ls_datapaths,
                                                 lsi->svc_monitor_map,
 +                                               lsi->ls_ports,
                                                 &lsi->match, &lsi->actions);
                  }
              }
-@@ -18158,6 +18286,7 @@ build_lswitch_and_lrouter_flows(
+@@ -18276,6 +18406,7 @@ build_lswitch_and_lrouter_flows(
              build_lswitch_flows_for_lb(lb_dps, lsi.lflows, lsi.meter_groups,
                                         lsi.ls_datapaths,
                                         lsi.svc_monitor_map,
 +                                       lsi.ls_ports,
                                         &lsi.match, &lsi.actions);
          }
          stopwatch_stop(LFLOWS_LBS_STOPWATCH_NAME, time_msec());
-@@ -18527,6 +18656,7 @@ lflow_handle_northd_lb_changes(struct ovsdb_idl_txn *ovnsb_txn,
+@@ -18645,6 +18776,7 @@ lflow_handle_northd_lb_changes(struct ovsdb_idl_txn *ovnsb_txn,
                                     lflow_input->meter_groups,
                                     lflow_input->ls_datapaths,
                                     lflow_input->svc_monitor_map,
@@ -314,7 +316,7 @@ index f6559c240..918016123 100644
 
          ds_destroy(&match);
 diff --git a/northd/northd.h b/northd/northd.h
-index ba86ac5c9..0d53cfac6 100644
+index ba86ac5c9..855f5908a 100644
 --- a/northd/northd.h
 +++ b/northd/northd.h
 @@ -813,6 +813,16 @@ find_route_outport(const struct hmap *lr_ports, const char *output_port,