diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index 89e6ba5..436e7ea 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -19788,6 +19788,19 @@ index ae59ecf2c2..34d45b82a1 100644
                  }
              } else if (retval < 0) {
                  VLOG_FATAL("waitpid failed (%s)", ovs_strerror(errno));
+diff --git a/lib/dns-resolve.c b/lib/dns-resolve.c
+index d344514343..8bcecb90ce 100644
+--- a/lib/dns-resolve.c
++++ b/lib/dns-resolve.c
+@@ -265,7 +265,7 @@ resolve_callback__(void *req_, int err, struct ub_result *result)
+     if (err != 0 || (result->qtype == ns_t_aaaa && !result->havedata)) {
+         ub_resolve_free(result);
+         req->state = RESOLVE_ERROR;
+-        VLOG_ERR_RL(&rl, "%s: failed to resolve", req->name);
++        VLOG_WARN_RL(&rl, "%s: failed to resolve", req->name);
+         return;
+     }
+ 
 diff --git a/lib/dp-packet.c b/lib/dp-packet.c
 index 72f6d09ac7..35c72542a2 100644
 --- a/lib/dp-packet.c
@@ -22274,6 +22287,132 @@ index a929ddfd2d..89a0bcaf95 100644
      if (deadline != LLONG_MAX) {
          long long int remaining = deadline - now;
          return MAX(0, MIN(INT_MAX, remaining));
+diff --git a/lib/socket-util.c b/lib/socket-util.c
+index 4f1ffecf5d..38705cc51e 100644
+--- a/lib/socket-util.c
++++ b/lib/socket-util.c
+@@ -62,7 +62,8 @@ static bool parse_sockaddr_components(struct sockaddr_storage *ss,
+                                       const char *port_s,
+                                       uint16_t default_port,
+                                       const char *s,
+-                                      bool resolve_host);
++                                      bool resolve_host,
++                                      bool *dns_failure);
+ 
+ /* Sets 'fd' to non-blocking mode.  Returns 0 if successful, otherwise a
+  * positive errno value. */
+@@ -438,7 +439,7 @@ parse_sockaddr_components_dns(struct sockaddr_storage *ss OVS_UNUSED,
+     dns_resolve(host_s, &tmp_host_s);
+     if (tmp_host_s != NULL) {
+         parse_sockaddr_components(ss, tmp_host_s, port_s,
+-                                  default_port, s, false);
++                                  default_port, s, false, NULL);
+         free(tmp_host_s);
+         return true;
+     }
+@@ -450,11 +451,15 @@ parse_sockaddr_components(struct sockaddr_storage *ss,
+                           char *host_s,
+                           const char *port_s, uint16_t default_port,
+                           const char *s,
+-                          bool resolve_host)
++                          bool resolve_host, bool *dns_failure)
+ {
+     struct sockaddr_in *sin = sin_cast(sa_cast(ss));
+     int port;
+ 
++    if (dns_failure) {
++        *dns_failure = false;
++    }
++
+     if (port_s && port_s[0]) {
+         if (!str_to_int(port_s, 10, &port) || port < 0 || port > 65535) {
+             VLOG_ERR("%s: bad port number \"%s\"", s, port_s);
+@@ -501,10 +506,15 @@ parse_sockaddr_components(struct sockaddr_storage *ss,
+     return true;
+ 
+ resolve:
+-    if (resolve_host && parse_sockaddr_components_dns(ss, host_s, port_s,
+-                                                      default_port, s)) {
+-        return true;
+-    } else if (!resolve_host) {
++    if (resolve_host) {
++        if (parse_sockaddr_components_dns(ss, host_s, port_s,
++                                          default_port, s)) {
++            return true;
++        }
++        if (dns_failure) {
++            *dns_failure = true;
++        }
++    } else {
+         VLOG_ERR("%s: bad IP address \"%s\"", s, host_s);
+     }
+ exit:
+@@ -521,10 +531,12 @@ exit:
+  * It resolves the host if 'resolve_host' is true.
+  *
+  * On success, returns true and stores the parsed remote address into '*ss'.
+- * On failure, logs an error, stores zeros into '*ss', and returns false. */
++ * On failure, logs an error, stores zeros into '*ss', and returns false,
++ * '*dns_failure' indicates if the host resolution failed. */
+ bool
+ inet_parse_active(const char *target_, int default_port,
+-                  struct sockaddr_storage *ss, bool resolve_host)
++                  struct sockaddr_storage *ss,
++                  bool resolve_host, bool *dns_failure)
+ {
+     char *target = xstrdup(target_);
+     char *port, *host;
+@@ -539,7 +551,7 @@ inet_parse_active(const char *target_, int default_port,
+         ok = false;
+     } else {
+         ok = parse_sockaddr_components(ss, host, port, default_port,
+-                                       target_, resolve_host);
++                                       target_, resolve_host, dns_failure);
+     }
+     if (!ok) {
+         memset(ss, 0, sizeof *ss);
+@@ -576,7 +588,7 @@ inet_open_active(int style, const char *target, int default_port,
+     int error;
+ 
+     /* Parse. */
+-    if (!inet_parse_active(target, default_port, &ss, true)) {
++    if (!inet_parse_active(target, default_port, &ss, true, NULL)) {
+         error = EAFNOSUPPORT;
+         goto exit;
+     }
+@@ -660,7 +672,7 @@ inet_parse_passive(const char *target_, int default_port,
+         ok = false;
+     } else {
+         ok = parse_sockaddr_components(ss, host, port, default_port,
+-                                       target_, true);
++                                       target_, true, NULL);
+     }
+     if (!ok) {
+         memset(ss, 0, sizeof *ss);
+@@ -783,7 +795,8 @@ inet_parse_address(const char *target_, struct sockaddr_storage *ss)
+ {
+     char *target = xstrdup(target_);
+     char *host = unbracket(target);
+-    bool ok = parse_sockaddr_components(ss, host, NULL, 0, target_, false);
++    bool ok = parse_sockaddr_components(ss, host, NULL, 0,
++                                        target_, false, NULL);
+     if (!ok) {
+         memset(ss, 0, sizeof *ss);
+     }
+diff --git a/lib/socket-util.h b/lib/socket-util.h
+index 9ccb7d4cc4..bf66393df9 100644
+--- a/lib/socket-util.h
++++ b/lib/socket-util.h
+@@ -49,7 +49,8 @@ ovs_be32 guess_netmask(ovs_be32 ip);
+ void inet_parse_host_port_tokens(char *s, char **hostp, char **portp);
+ void inet_parse_port_host_tokens(char *s, char **portp, char **hostp);
+ bool inet_parse_active(const char *target, int default_port,
+-                       struct sockaddr_storage *ssp, bool resolve_host);
++                       struct sockaddr_storage *ssp,
++                       bool resolve_host, bool *dns_failure);
+ int inet_open_active(int style, const char *target, int default_port,
+                      struct sockaddr_storage *ssp, int *fdp, uint8_t dscp);
+ 
 diff --git a/lib/stopwatch.c b/lib/stopwatch.c
 index f5602163bc..1c71df1a12 100644
 --- a/lib/stopwatch.c
@@ -22349,6 +22488,19 @@ index 809b405a52..a869b5f390 100644
          p->error_count++;
          goto out;
      }
+diff --git a/lib/stream.c b/lib/stream.c
+index e246b37735..99559fde91 100644
+--- a/lib/stream.c
++++ b/lib/stream.c
+@@ -763,7 +763,7 @@ stream_parse_target_with_default_port(const char *target, int default_port,
+                                       struct sockaddr_storage *ss)
+ {
+     return ((!strncmp(target, "tcp:", 4) || !strncmp(target, "ssl:", 4))
+-            && inet_parse_active(target + 4, default_port, ss, true));
++            && inet_parse_active(target + 4, default_port, ss, true, NULL));
+ }
+ 
+ /* Attempts to guess the content type of a stream whose first few bytes were
 diff --git a/lib/tc.c b/lib/tc.c
 index 3192207984..2113934310 100644
 --- a/lib/tc.c
@@ -23344,10 +23496,20 @@ index d5abe9c2ed..dcecdab212 100755
  import re
  import sys
 diff --git a/ofproto/ofproto-dpif-sflow.c b/ofproto/ofproto-dpif-sflow.c
-index fdcb9eabbf..864c136b5d 100644
+index fdcb9eabbf..0f4a61ac6b 100644
 --- a/ofproto/ofproto-dpif-sflow.c
 +++ b/ofproto/ofproto-dpif-sflow.c
-@@ -1292,10 +1292,10 @@ dpif_sflow_received(struct dpif_sflow *ds, const struct dp_packet *packet,
+@@ -468,7 +468,8 @@ sflow_choose_agent_address(const char *agent_device,
+     const char *target;
+     SSET_FOR_EACH (target, targets) {
+         struct sockaddr_storage ss;
+-        if (inet_parse_active(target, SFL_DEFAULT_COLLECTOR_PORT, &ss, true)) {
++        if (inet_parse_active(target, SFL_DEFAULT_COLLECTOR_PORT,
++                              &ss, true, NULL)) {
+             /* sFlow only supports target in default routing table with
+              * packet mark zero.
+              */
+@@ -1292,10 +1293,10 @@ dpif_sflow_received(struct dpif_sflow *ds, const struct dp_packet *packet,
      ovs_be16 vlan_tci;
  
      ovs_mutex_lock(&mutex);
@@ -24377,10 +24539,34 @@ index 5914e08789..20c5f6399f 100755
  
  struct %(s)s *
 diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
-index 29a2bace84..ce6aee3008 100644
+index 29a2bace84..ce84f1e9b2 100644
 --- a/ovsdb/ovsdb-server.c
 +++ b/ovsdb/ovsdb-server.c
-@@ -655,8 +655,6 @@ add_db(struct server_config *config, struct db *db)
+@@ -26,6 +26,7 @@
+ #include "command-line.h"
+ #include "daemon.h"
+ #include "dirs.h"
++#include "dns-resolve.h"
+ #include "openvswitch/dynamic-string.h"
+ #include "fatal-signal.h"
+ #include "file.h"
+@@ -319,6 +320,7 @@ main(int argc, char *argv[])
+     service_start(&argc, &argv);
+     fatal_ignore_sigpipe();
+     process_init();
++    dns_resolve_init(true);
+ 
+     bool active = false;
+     parse_options(argc, argv, &db_filenames, &remotes, &unixctl_path,
+@@ -501,6 +503,7 @@ main(int argc, char *argv[])
+                       run_command, process_status_msg(status));
+         }
+     }
++    dns_resolve_destroy();
+     perf_counters_destroy();
+     service_stop();
+     return 0;
+@@ -655,8 +658,6 @@ add_db(struct server_config *config, struct db *db)
  static struct ovsdb_error * OVS_WARN_UNUSED_RESULT
  open_db(struct server_config *config, const char *filename)
  {
@@ -24389,7 +24575,7 @@ index 29a2bace84..ce6aee3008 100644
      /* If we know that the file is already open, return a good error message.
       * Otherwise, if the file is open, we'll fail later on with a harder to
       * interpret file locking error. */
-@@ -671,9 +669,6 @@ open_db(struct server_config *config, const char *filename)
+@@ -671,9 +672,6 @@ open_db(struct server_config *config, const char *filename)
          return error;
      }
  
@@ -24399,7 +24585,7 @@ index 29a2bace84..ce6aee3008 100644
      struct ovsdb_schema *schema;
      if (ovsdb_storage_is_clustered(storage)) {
          schema = NULL;
-@@ -686,6 +681,9 @@ open_db(struct server_config *config, const char *filename)
+@@ -686,6 +684,9 @@ open_db(struct server_config *config, const char *filename)
          }
          ovs_assert(schema && !txn_json);
      }
@@ -24442,6 +24628,22 @@ index 9042658fa8..e019631e9a 100644
      return error;
  }
  
+diff --git a/ovsdb/raft-private.c b/ovsdb/raft-private.c
+index 26d39a087f..7b7bcd74ac 100644
+--- a/ovsdb/raft-private.c
++++ b/ovsdb/raft-private.c
+@@ -33,7 +33,10 @@ raft_address_validate(const char *address)
+         return NULL;
+     } else if (!strncmp(address, "ssl:", 4) || !strncmp(address, "tcp:", 4)) {
+         struct sockaddr_storage ss;
+-        if (!inet_parse_active(address + 4, -1, &ss, true)) {
++        bool dns_failure = false;
++
++        if (!inet_parse_active(address + 4, -1, &ss, true, &dns_failure)
++            && !dns_failure) {
+             return ovsdb_error(NULL, "%s: syntax error in address", address);
+         }
+         return NULL;
 diff --git a/ovsdb/raft.c b/ovsdb/raft.c
 index ea91d1fdba..a11144edcd 100644
 --- a/ovsdb/raft.c
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 95378b4..55d0993 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 87%{?dist}
+Release: 88%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Mar 30 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-88
+- Merging upstream branch-2.15 [RH git: a03b5c62e4]
+    Commit list:
+    0a3867a9a9 ovsdb: raft: Fix inability to read the database with DNS host names. (#2055097)
+
+
 * Mon Mar 28 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-87
 - Merging upstream branch-2.15 [RH git: bba298f05e]
     Commit list: