Skip to content

Workaround to TS-4207 #553

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
asfgit merged 1 commit into from
Apr 7, 2016
Merged

Workaround to TS-4207 #553

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
2 changes: 1 addition & 1 deletion iocore/hostdb/MultiCache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ MultiCacheBase::initialize(Store *astore, char *afilename, int aelements, int ab
astore->free(*store);
delete store;
store = NULL;
Warning("Configured store too small, unable to reconfigure");
Warning("Configured store too small (actual=%d required=%d), unable to reconfigure", got * STORE_BLOCK_SIZE, blocks * STORE_BLOCK_SIZE);
return -3;
}
totalsize = (STORE_BLOCK_SIZE)*blocks;
Expand Down
3 changes: 2 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 @@ -217,10 +217,11 @@ struct HostDBCache : public MultiCache<HostDBInfo> {

// This accounts for an average of 2 HostDBInfo per DNS cache (for round-robin etc.)
// In addition, we can do a padding for additional SRV records storage.
// In addition, we add 120 for hostname storage (since we now always do that)
virtual size_t
estimated_heap_bytes_per_entry() const
{
return sizeof(HostDBInfo) * 2 + 512 * hostdb_srv_enabled;
return sizeof(HostDBInfo) * 2 + 512 * hostdb_srv_enabled + 120;
}

// Map to contain all of the host file overrides, initialize it to empty
Expand Down
2 changes: 1 addition & 1 deletion mgmt/RecordsConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.hostdb.storage_path", RECD_STRING, TS_BUILD_CACHEDIR, RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.hostdb.storage_size", RECD_INT, "33554432", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
{RECT_CONFIG, "proxy.config.hostdb.storage_size", RECD_INT, "45375488", RECU_DYNAMIC, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
// # in minutes (all three)
// # 0 = obey, 1 = ignore, 2 = min(X,ttl), 3 = max(X,ttl)
Expand Down