Skip to content

PCD-8825: ignoring PF9 build/patch numbers don't count as a mismatch #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharma-tapas merged 1 commit into from
Aug 3, 2026
Merged

PCD-8825: ignoring PF9 build/patch numbers don't count as a mismatch #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 43 additions & 3 deletions controller/ovn-controller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5140,8 +5140,38 @@ pflow_lflow_output_sb_chassis_handler(struct engine_node *node,
return true;
}

/* PF9 start */
/* Returns a newly allocated string with the PF9-specific ".pf9.<...>"
* build sub-version stripped out of an OVN internal version string, e.g.
* "24.03.6.pf9.2026.4.0.385-20.33.0-76.8" -> "24.03.6-20.33.0-76.8".
* If no ".pf9" marker is found, returns an unmodified copy. The caller
* must free the returned value. */
static char *
ovn_version_base(const char *version)

@psarwate psarwate Aug 3, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: would it make more sense to rename function itself as pf9_ovn_version_base?

Rest code looks good. approving.

{
const char *pf9_marker = strstr(version, ".pf9");
if (!pf9_marker) {
return xstrdup(version);
}

const char *suffix = strchr(pf9_marker, '-');
size_t prefix_len = pf9_marker - version;
size_t suffix_len = suffix ? strlen(suffix) : 0;

char *base = xmalloc(prefix_len + suffix_len + 1);
memcpy(base, version, prefix_len);
if (suffix) {
memcpy(base + prefix_len, suffix, suffix_len);
}
base[prefix_len + suffix_len] = '\0';
return base;
}
/* PF9 end */

/* Returns false if the northd internal version stored in SB_Global
* and ovn-controller internal version don't match.
* and ovn-controller internal version don't match, ignoring the
* PF9-specific ".pf9.<...>" build sub-version on either side so that
* differing PF9 build/patch numbers don't count as a mismatch.
*/
static bool
check_northd_version(struct ovsdb_idl *ovs_idl, struct ovsdb_idl *ovnsb_idl,
Expand Down Expand Up @@ -5169,13 +5199,23 @@ check_northd_version(struct ovsdb_idl *ovs_idl, struct ovsdb_idl *ovnsb_idl,
const char *northd_version =
smap_get_def(&sb->options, "northd_internal_version", "");

if (strcmp(northd_version, version)) {
/* PF9 start */
char *version_base = ovn_version_base(version);
char *northd_version_base = ovn_version_base(northd_version);
bool mismatch = strcmp(northd_version_base, version_base);

if (mismatch) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
VLOG_WARN_RL(&rl, "controller version - %s mismatch with northd "
"version - %s", version, northd_version);
"version - %s", version_base, northd_version_base);
free(version_base);
free(northd_version_base);
version_mismatch = true;
return false;
}
free(version_base);
free(northd_version_base);
/* PF9 end */

/* If there used to be a mismatch and ovn-northd got updated, force a
* full recompute.
Expand Down
Loading