Skip to content

HostDB: Fix cache data version checking to use full version, not only major version. #7263

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
SolidWallOfCode merged 1 commit into from
Oct 9, 2020
Merged

HostDB: Fix cache data version checking to use full version, not only major version. #7263

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions iocore/hostdb/P_RefCountCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,8 @@ class RefCountCacheHeader
ts::VersionNumber object_version; // version passed in of whatever it is we are caching

RefCountCacheHeader(ts::VersionNumber object_version = ts::VersionNumber());
bool operator==(const RefCountCacheHeader other) const;
bool compatible(RefCountCacheHeader *other) const;
bool operator==(RefCountCacheHeader const &that) const;
bool compatible(RefCountCacheHeader *that) const;
};

// RefCountCache is a ref-counted key->value map to store classes that inherit from RefCountObj.
Expand Down
9 changes: 4 additions & 5 deletions iocore/hostdb/RefCountCache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,13 @@ RefCountCacheHashEntry::dealloc(RefCountCacheHashEntry *e)
RefCountCacheHeader::RefCountCacheHeader(ts::VersionNumber object_version) : object_version(object_version){};

bool
RefCountCacheHeader::operator==(const RefCountCacheHeader other) const
RefCountCacheHeader::operator==(RefCountCacheHeader const &that) const
{
return this->magic == other.magic && this->version == other.version;
return this->magic == that.magic && this->version == that.version;
}

bool
RefCountCacheHeader::compatible(RefCountCacheHeader *other) const
RefCountCacheHeader::compatible(RefCountCacheHeader *that) const
{
return (this->magic == other->magic && this->version._major == other->version._major &&
this->object_version._major == other->version._major);
return this->magic == that->magic && this->version == that->version && this->object_version == that->version;
};