Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 7 additions & 3 deletions iocore/cache/Cache.cc
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,8 @@ CacheProcessor::start_internal(int flags)
}
Emergency("Cache initialization failed - only %d out of %d disks were valid and all were required.", gndisks,
theCacheStore.n_disks_in_config);
} else if (this->waitForCache() == 2 && static_cast<unsigned int>(gndisks) < theCacheStore.n_disks_in_config) {
Warning("Cache initialization incomplete - only %d out of %d disks were valid.", gndisks, theCacheStore.n_disks_in_config);
}

// If we got here, we have enough disks to proceed
Expand Down Expand Up @@ -784,7 +786,9 @@ CacheProcessor::diskInitialized()
if (cb_after_init) {
cb_after_init();
}
Fatal("Cache initialization failed - only %d of %d disks were available.", gndisks, theCacheStore.n_disks_in_config);
Emergency("Cache initialization failed - only %d of %d disks were available.", gndisks, theCacheStore.n_disks_in_config);
} else if (this->waitForCache() == 2) {
Warning("Cache initialization incomplete - only %d of %d disks were available.", gndisks, theCacheStore.n_disks_in_config);
}
}

Expand Down Expand Up @@ -1052,7 +1056,7 @@ CacheProcessor::cacheInitialized()

// TS-3848
if (CACHE_INIT_FAILED == CacheProcessor::initialized && cacheProcessor.waitForCache() > 1) {
Fatal("Cache initialization failed with cache required, exiting.");
Emergency("Cache initialization failed with cache required, exiting.");
}
}

Expand Down Expand Up @@ -2062,7 +2066,7 @@ Cache::open_done()

// TS-3848
if (ready == CACHE_INIT_FAILED && cacheProcessor.waitForCache() >= 2) {
Fatal("Failed to initialize cache host table");
Emergency("Failed to initialize cache host table");
}

cacheProcessor.cacheInitialized();
Expand Down
10 changes: 7 additions & 3 deletions src/traffic_manager/traffic_manager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,8 @@ main(int argc, const char **argv)
char *tsArgs = nullptr;
int disable_syslog = false;
char userToRunAs[MAX_LOGIN + 1];
RecInt fds_throttle = -1;
RecInt fds_throttle = -1;
bool printed_unrecoverable = false;

ArgumentDescription argument_descriptions[] = {
{"proxyOff", '-', "Disable proxy", "F", &proxy_off, nullptr, nullptr},
Expand Down Expand Up @@ -831,9 +832,12 @@ main(int argc, const char **argv)
} else {
just_started++;
}
} else { /* Give the proxy a chance to fire up */
if (!lmgmt->proxy_recoverable) {
} else {
// Even if we shouldn't try to start the proxy again, leave manager around to
// avoid external automated restarts
if (!lmgmt->proxy_recoverable && !printed_unrecoverable) {
mgmt_log("[main] Proxy is un-recoverable. Proxy will not be relaunched.\n");
printed_unrecoverable = true;
}

just_started++;
Expand Down