feat etcd: Init etcd client by eskedesu · Pull Request #837 · userver-framework/userver

eskedesu · 2025-01-20T08:37:57Z

Note: by creating a PR or an issue you automatically agree to the CLA. See CONTRIBUTING.md. Feel free to remove this note, the agreement holds.

cmake/install/userver-etcd-config.cmake

etcd/include/userver/storages/etcd/component.hpp

etcd/include/userver/storages/etcd/client.hpp

etcd/include/userver/storages/etcd/settings.hpp

etcd/src/storages/etcd/client.cpp

etcd/src/storages/etcd/component.cpp

etcd/include/userver/storages/etcd/client.hpp

etcd/src/storages/etcd/client.cpp

etcd/include/userver/storages/etcd/client.hpp

etcd/include/userver/storages/etcd/component.hpp

etcd/include/userver/storages/etcd/watch_listener.hpp

etcd/src/storages/etcd/client.cpp

segoon · 2025-02-03T02:48:20Z

etcd/include/userver/storages/etcd/client.hpp

+#pragma once
+
+#include <chrono>
+#include <cstdint>


давай сразу клиента конфига сделаешь до полноценного watch event'а - так будет проще понять, какой API требуется и что еще необходимо сделать

Кажется, сделал, получать ивенты можно из WatchListener'а

etcd/src/etcd/client_impl.cpp

etcd/src/etcd/client_impl.hpp

etcd/src/etcd/client_impl.cpp

etcd/include/userver/etcd/client.hpp

testsuite/pytest_plugins/pytest_userver/plugins/etcd.py

etcd/include/userver/etcd/watch_listener.hpp

etcd/src/etcd/client_impl.cpp

etcd/include/userver/etcd/watch_listener.hpp

etcd/src/etcd/etcd_responses.cpp

etcd/src/etcd/client_impl.cpp

segoon · 2025-05-16T07:33:04Z

chaotic/chaotic/back/cpp/translator.py

        if schema.format:
            if schema.format == types.StringFormat.BYTE:
-                format_cpp_type = 'crypto::base64::String64'
+                format_cpp_type = '::crypto::base64::String64'


USERVER_NAMESPACE::

segoon · 2025-05-16T07:33:07Z

chaotic/include/userver/chaotic/io/crypto/base64/string64.hpp

 namespace chaotic::convert {

-crypto::base64::String64 Convert(const std::string& str, chaotic::convert::To<crypto::base64::String64>);
+::crypto::base64::String64 Convert(const std::string& str, chaotic::convert::To<::crypto::base64::String64>);


USERVER_NAMESPACE::

Тут внес String64 внутрь и теперь убрал префикс ::, до этого String64 лежал вне юсервисного неймспейса

segoon · 2025-05-16T07:33:19Z

chaotic/integration_tests/tests/render/simple.cpp


 TEST(SIMPLE, String64) {
-    auto str64 = crypto::base64::String64{"hello, userver!"};
+    auto str64 = ::crypto::base64::String64{"hello, userver!"};


USERVER_NAMESPACE::

Тут внес String64 внутрь и теперь убрал префикс ::, до этого String64 лежал вне юсервисного неймспейса

segoon · 2025-05-16T07:33:23Z

chaotic/tests/back/cpp/test_tr_string.py

        '::type': cpp_types.CppStringWithFormat(
            raw_cpp_type=type_name.TypeName('std::string'),
-            format_cpp_type='crypto::base64::String64',
+            format_cpp_type='::crypto::base64::String64',


USERVER_NAMESPACE::

Добавил

segoon · 2025-05-16T07:34:58Z

etcd/include/userver/etcd/watch_listener.hpp

+    WatchListener(concurrent::SpscQueue<KeyValueState>::Consumer&& consumer);
+
+    /// @brief Get an event from etcd if there was one, otherwise waits asynchronously until a next event occurs.
+    /// If the event producing coroutine finished or failed, GetEvent raises EtcdError exception


Добавил

segoon · 2025-05-16T07:42:56Z

etcd/src/etcd/client_impl.cpp

+
+std::string BuildDeleteData(std::string_view key) {
+    const auto etcd_key = fmt::format("{}{}", kKeyPrefix, key);
+    return formats::json::ToString(formats::json::MakeObject("key", crypto::base64::Base64Encode(etcd_key)));


везде где есть base64 - в хаотик

segoon · 2025-05-16T07:43:48Z

etcd/src/etcd/settings.cpp

+
+constexpr std::uint32_t kDefaultAttempts{3};
+constexpr std::chrono::milliseconds kDefaultRequestTimeout{1'000};
+constexpr std::chrono::milliseconds kDefaultWatchTimeout{1'000'000};


1000 секунд всего? а что будет когда истечет?

segoon · 2025-05-16T07:45:04Z

etcd/include/userver/etcd/settings.hpp

+    // Etcd endpoints to which client make HTTP requests
+    std::vector<std::string> endpoints;
+    // Number of attempts to each endpoint, on failed attempts client randomly moves to another endpoint
+    std::uint32_t attempts;


segoon · 2025-05-16T07:45:14Z

etcd/include/userver/etcd/settings.hpp

+    // Number of attempts to each endpoint, on failed attempts client randomly moves to another endpoint
+    std::uint32_t attempts;
+    // Timeout for all HTTP requests to etcd except watch request
+    std::chrono::microseconds request_timeout_ms;


{дефолт}

segoon · 2025-05-16T07:45:33Z

etcd/include/userver/etcd/settings.hpp

+    std::chrono::microseconds request_timeout_ms;
+    // Timeout for watch HTTP request. It's a stremed request, so it is used also as a connection timeout, so it should
+    // not be too short
+    std::chrono::microseconds watch_timeout_ms;


{дефолт}

segoon reviewed Jan 20, 2025

View reviewed changes

segoon reviewed Feb 3, 2025

View reviewed changes

segoon reviewed Feb 16, 2025

View reviewed changes

segoon reviewed May 7, 2025

View reviewed changes

segoon reviewed May 15, 2025

View reviewed changes

segoon reviewed May 16, 2025

View reviewed changes

eskedesu force-pushed the init_etcd_client branch from 29c17ef to d3e676c Compare June 19, 2025 21:46

eskedesu added 23 commits June 20, 2025 00:57

init etcd client

7b19158

minor fixes

0de1248

iteration

5436c1e

rename client

eb2bc58

iteration

4ff1170

iteration

83b37a5

iteration

bb38f45

iteration

1fe00a2

iteration

1479ef2

iteration

99aacab

iteration

2b41803

iteration

0c95754

iteration

627a9f9

iteration

2c59b2f

remove connection timeout change

2e5d7f5

remove allowed url prefix

6445363

fix config plugin

733ad26

format

063030b

fix doc

333cbd4

add tests

5377ffb

add tests

710ae63

add watch test

95ff228

delete file

dc75cd5

eskedesu added 19 commits June 20, 2025 00:57

iteration

5240f6d

format

b8d928e

iteration

3f3c400

iteration

35b4ca7

iteration

e44ad3f

fix namespaces

c9b0675

iteration

31e5baf

format

2719aff

Add retries for watch

0b7928f

fix WatchListener

95a1928

add chaotic

62acc29

iteration

968930c

fix convertion

0738894

fix convertion

77662ef

fix namespace

cca6434

fix namespaces for string64

bc49574

add throws tag

298d7d3

switch to BackgroundTaskStorage

38446b4

fix logs

cb883c0

eskedesu force-pushed the init_etcd_client branch from d3e676c to cb883c0 Compare June 19, 2025 21:57

Conversation

eskedesu commented Jan 20, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eskedesu May 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

eskedesu May 9, 2025 •

edited

Loading