Skip to content

hostdb: don't use next_sync_time - now() as TTL (it can be negative) #6979

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
shinrich merged 2 commits into from
Jul 10, 2020
Merged

hostdb: don't use next_sync_time - now() as TTL (it can be negative) #6979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0d93dc
hostdb: don't use next_sync_time - now() as TTL (it can be negative)
joelanders Jul 7, 2020
899b329
make clang-format happy
joelanders Jul 8, 2020
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
10 changes: 4 additions & 6 deletions iocore/hostdb/HostDB.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1654,9 +1654,8 @@ HostDBContinuation::do_dns()
HostsFileMap::iterator find_result = current_host_file_map->hosts_file_map.find(hname);
if (find_result != current_host_file_map->hosts_file_map.end()) {
if (action.continuation) {
// Set the TTL based on how much time remains until the next sync
HostDBInfo *r = lookup_done(IpAddr(find_result->second), hash.host_name, false,
current_host_file_map->next_sync_time - ink_time(), nullptr);
// Set the TTL based on how often we stat() the host file
HostDBInfo *r = lookup_done(IpAddr(find_result->second), hash.host_name, false, hostdb_hostfile_check_interval, nullptr);
reply_to_cont(action.continuation, r);
}
hostdb_cont_free(this);
Expand Down Expand Up @@ -2240,9 +2239,8 @@ ParseHostFile(const char *path, unsigned int hostdb_hostfile_check_interval_pars
// +1 in case no terminating newline
int64_t size = info.st_size + 1;

parsed_hosts_file_ptr = new RefCountedHostsFileMap;
parsed_hosts_file_ptr->next_sync_time = ink_time() + hostdb_hostfile_check_interval_parse;
parsed_hosts_file_ptr->HostFileText = static_cast<char *>(ats_malloc(size));
parsed_hosts_file_ptr = new RefCountedHostsFileMap;
parsed_hosts_file_ptr->HostFileText = static_cast<char *>(ats_malloc(size));
if (parsed_hosts_file_ptr->HostFileText) {
char *base = parsed_hosts_file_ptr->HostFileText;
char *limit;
Expand Down
1 change: 0 additions & 1 deletion iocore/hostdb/P_HostDBProcessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ typedef std::map<ts::ConstBuffer, IpAddr, CmpConstBuffferCaseInsensitive> HostsF
struct RefCountedHostsFileMap : public RefCountObj {
HostsFileMap hosts_file_map;
ats_scoped_str HostFileText;
ink_time_t next_sync_time; // time of the next sync
};

//
Expand Down