wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from ajbeamon/remove-non-network-thread-suppressions 

Remove suppressions happening off the network thread
This commit is contained in:
Evan Tschannen 2018-08-14 11:03:16 -07:00 committed by GitHub
parent de396d15f2 168dce94cb
commit b7e08377b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdbrpc/TLSConnection.actor.cpp
View File

@ -205,11 +205,11 @@ Reference<IListener> TLSNetworkConnections::listen( NetworkAddress localAddr ) {
void TLSOptions::set_cert_file( std::string const& cert_file ) {
try {
TraceEvent("TLSConnectionSettingCertFile").suppressFor(1.0).detail("CertFilePath", cert_file);
TraceEvent("TLSConnectionSettingCertFile").detail("CertFilePath", cert_file);
policyInfo.cert_path = cert_file;
set_cert_data( readFileBytes( cert_file, CERT_FILE_MAX_SIZE ) );
} catch ( Error& ) {
TraceEvent(SevError, "TLSOptionsSetCertFileError").suppressFor(1.0).detail("Filename", cert_file);
TraceEvent(SevError, "TLSOptionsSetCertFileError").detail("Filename", cert_file);
throw;
}
}
@ -437,12 +437,12 @@ Reference<ITLSPolicy> TLSOptions::get_policy(PolicyType type) {
void TLSOptions::init_plugin() {
TraceEvent("TLSConnectionLoadingPlugin").suppressFor(1.0).detail("Plugin", tlsPluginName);
TraceEvent("TLSConnectionLoadingPlugin").detail("Plugin", tlsPluginName);
plugin = loadPlugin<ITLSPlugin>( tlsPluginName );
if ( !plugin ) {
TraceEvent(SevError, "TLSConnectionPluginInitError").suppressFor(1.0).detail("Plugin", tlsPluginName).GetLastError();
TraceEvent(SevError, "TLSConnectionPluginInitError").detail("Plugin", tlsPluginName).GetLastError();
throw tls_error();
}

4
flow/Trace.cpp
View File

@ -671,7 +671,7 @@ TraceEvent& TraceEvent::detailImpl( std::string&& key, std::string&& value, bool
fields.addField(std::move(key), std::move(value));
if(fields.sizeBytes() > TRACE_EVENT_MAX_SIZE) {
TraceEvent(SevError, "TraceEventOverflow").detail("TraceFirstBytes", fields.toString().substr(300));
TraceEvent(g_network && g_network->isSimulated() ? SevError : SevWarnAlways, "TraceEventOverflow").detail("TraceFirstBytes", fields.toString().substr(300));
enabled = false;
}
}
@ -806,7 +806,7 @@ TraceEvent& TraceEvent::suppressFor( double duration, bool logSuppressedEventCou
}
}
else {
TraceEvent(SevError, "SuppressionFromNonNetworkThread");
TraceEvent(SevWarnAlways, "SuppressionFromNonNetworkThread").detail("Type", type);
detail("__InvalidSuppression__", ""); // Choosing a detail name that is unlikely to collide with other names
}
}