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

Jump to bottom

Fix etcd exponential retry #40

Merged
merged 5 commits into from
Mar 23, 2022
Merged

Fix etcd exponential retry #40

merged 5 commits into from
Mar 23, 2022

Conversation

rsafonseca
Copy link
Contributor

@rsafonseca rsafonseca commented Mar 18, 2022 •
edited
Loading

  • Fix etcd exponential retry bug (left shift by -1 )
  • Bump boost from 1.75.0 to 1.78.0
  • Bump openssl from 1.1.1l to 1.1.1m
  • Bump nats.c from 2.5.0 to 3.3.0
  • Bump grpc from 1.37.0 to 1.44.0
  • Bump protobuf 3.15.5 to 3.19.2
  • Move cpprestsdk into conan instead of hardcoded into the repo (fixes compilation with XCode 13.1)
  • Move grpc into conan instead of hardcoded into the repo
  • Update docker image to use CLang 13 instead of 11
  • Bump c++ spec from 11 to 17
  • Compile new protos with updated protoc

leohahn
leohahn reviewed Mar 21, 2022
View reviewed changes
cpp-lib/deps/etcd-cpp-api/src/CMakeLists.txt Outdated
@@ -81,7 +81,7 @@ else()
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib" ".dylib" ".so" ".dll")
endif()

find_package(cpprestsdk REQUIRED)
#find_package(cpprestsdk REQUIRED)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason why the line is commented out and not removed?

leohahn
leohahn reviewed Mar 21, 2022
View reviewed changes
cpp-lib/src/pitaya/etcdv3_service_discovery/worker.cpp
@@ -216,7 +216,7 @@ Worker::StartThread()
_syncServersTicker.Stop();

while (_numKeepAliveRetriesLeft > 0) {
auto delay_milliseconds = _config.retryDelayMilliseconds << ((_config.maxNumberOfRetries - _numKeepAliveRetriesLeft) - 1);
auto delay_milliseconds = _config.retryDelayMilliseconds << (_config.maxNumberOfRetries - _numKeepAliveRetriesLeft);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this line breaking the server?

@rsafonseca rsafonseca merged commit 969b18e into master Mar 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leohahn leohahn leohahn left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rsafonseca @leohahn