Skip to content
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

Add DTRACE points to measure request timings. #11245

Merged
merged 18 commits into from
Mar 20, 2020
Merged

Add DTRACE points to measure request timings. #11245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
47bacf7
Add DTRACE probes for request infrastructure timing.
neunhoef Mar 3, 2020
213263d
DTrace working.
neunhoef Mar 4, 2020
8363264
Merge remote-tracking branch 'origin/devel' into feature/dtrace
neunhoef Mar 4, 2020
d85e7ca
Include sdt.h with source.
neunhoef Mar 5, 2020
5e6d6d4
Merge branch 'feature/dtrace' of ssh://github.com/arangodb/arangodb i…
neunhoef Mar 5, 2020
60c620b
Merge remote-tracking branch 'origin/devel' into feature/dtrace
neunhoef Mar 5, 2020
89dc1a7
Do VstCommTask, too.
neunhoef Mar 5, 2020
d088e52
Add example files for bpftrace.
neunhoef Mar 5, 2020
ea70ab9
Comments for examples.
neunhoef Mar 5, 2020
1da7311
Fix compilation and script.
neunhoef Mar 5, 2020
d4c0ce6
Bugfixes.
neunhoef Mar 5, 2020
a21303a
Merge remote-tracking branch 'origin/devel' into feature/dtrace
neunhoef Mar 10, 2020
e50a20c
Merge remote-tracking branch 'origin/devel' into feature/dtrace
neunhoef Mar 11, 2020
b99c41b
Merge remote-tracking branch 'origin/devel' into feature/dtrace
neunhoef Mar 12, 2020
5935be4
Merge remote-tracking branch 'origin/devel' into feature/dtrace
neunhoef Mar 13, 2020
b56ee2b
Fix HTTP/2 server side switching.
neunhoef Mar 13, 2020
3ffaa4c
Merge branch 'devel' of github.com:arangodb/arangodb into feature/dtrace
jsteemann Mar 20, 2020
331de30
move most stuff into dtrace-wrapper.h
jsteemann Mar 20, 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
Prev Previous commit
Next Next commit
DTrace working.
  • Loading branch information
@neunhoef
neunhoef committed Mar 4, 2020
commit 213263d8b222fc63e7541c02ae6c970b9acce597
12 changes: 10 additions & 2 deletions arangod/GeneralServer/SslServerFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ SslServerFeature::SslServerFeature(application_features::ApplicationServer& serv
_sslProtocol(TLS_GENERIC),
_sslOptions(asio_ns::ssl::context::default_workarounds |
asio_ns::ssl::context::single_dh_use),
_ecdhCurve("prime256v1") {
_ecdhCurve("prime256v1"),
_allowHttpProtocolNegotiation(true) {
setOptional(true);
startsAfter<application_features::AqlFeaturePhase>();
}
Expand Down Expand Up @@ -116,6 +117,11 @@ void SslServerFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
"--ssl.ecdh-curve",
"SSL ECDH Curve, see the output of \"openssl ecparam -list_curves\"",
new StringParameter(&_ecdhCurve));

options->addOption(
"--ssl.allow-http-protocol-negotiation",
"Allows that the TLS handshake negotiates the HTTP protocol version",
new BooleanParameter(&_allowHttpProtocolNegotiation));
}

void SslServerFeature::validateOptions(std::shared_ptr<ProgramOptions> options) {
Expand Down Expand Up @@ -334,7 +340,9 @@ std::shared_ptr<asio_ns::ssl::context> SslServerFeature::createSslContext() {

sslContext->set_verify_mode(SSL_VERIFY_NONE);

SSL_CTX_set_alpn_select_cb(sslContext->native_handle(), alpn_select_proto_cb, NULL);
if (_allowHttpProtocolNegotiation) {
SSL_CTX_set_alpn_select_cb(sslContext->native_handle(), alpn_select_proto_cb, NULL);
}

return sslContext;
} catch (std::exception const& ex) {
Expand Down
1 change: 1 addition & 0 deletions arangod/GeneralServer/SslServerFeature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ class SslServerFeature : public application_features::ApplicationFeature {
uint64_t _sslProtocol;
uint64_t _sslOptions;
std::string _ecdhCurve;
bool _allowHttpProtocolNegotiation;

private:
std::string stringifySslOptions(uint64_t opts) const;
Expand Down