feat etcd: Init etcd client #837

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

@@ -444,7 +444,7 @@ def _gen_string(

        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

@@ -18,9 +18,9 @@ USERVER_NAMESPACE_BEGIN

 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::

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

chaotic/integration_tests/tests/render/simple.cpp

@@ -369,7 +369,7 @@ TEST(Simple, Uuid) {
 }

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


USERVER_NAMESPACE::

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

chaotic/tests/back/cpp/test_tr_string.py

@@ -54,7 +54,7 @@ def test_byte(simple_gen):
    assert types == {
        '::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;


{дефолт}

eskedesu added 4 commits January 17, 2025 01:09

init etcd client

145a211

minor fixes

b184754

iteration

bf56139

rename client

3c1e377

segoon reviewed Jan 20, 2025

View reviewed changes

eskedesu added 2 commits February 2, 2025 01:28

iteration

fc3f6e7

iteration

a1119f6

segoon reviewed Feb 3, 2025

View reviewed changes

iteration

330ef41

segoon reviewed Feb 16, 2025

View reviewed changes

eskedesu and others added 16 commits February 17, 2025 01:24

iteration

dfcee7d

iteration

327f1fc

iteration

54c585b

iteration

00b6bb8

iteration

497666d

iteration

dc8b0f9

iteration

636ef6b

remove connection timeout change

79818cc

remove allowed url prefix

c83160a

fix config plugin

4207ee2

format

ae04fb6

fix doc

9903913

Merge branch 'userver-framework:develop' into init_etcd_client

40ce833

add tests

7c571f3

add tests

6e1993f

add watch test

5ab0eab

segoon reviewed May 7, 2025

View reviewed changes

eskedesu added 3 commits May 7, 2025 20:40

delete file

ba964f7

iteration

e9c866c

format

fe9b745

eskedesu and others added 7 commits May 10, 2025 02:07

iteration

b8f4a82

iteration

2d02e27

iteration

2ff2c8a

fix namespaces

83f325c

Merge branch 'userver-framework:develop' into init_etcd_client

6a7d901

iteration

8d5c5d4

format

3f896d8

segoon reviewed May 15, 2025

View reviewed changes

eskedesu added 6 commits May 15, 2025 23:03

Add retries for watch

a2f72a4

fix WatchListener

2d2ef4b

add chaotic

81b7f32

iteration

1870b81

fix convertion

d664db7

fix convertion

645a253

segoon reviewed May 16, 2025

View reviewed changes

eskedesu added 5 commits May 16, 2025 13:41

fix namespace

c2c8657

fix namespaces for string64

195dc37

add throws tag

df6fc8c

switch to BackgroundTaskStorage

da9adcb

fix logs

f4b316a

feat etcd: Init etcd client #837

Are you sure you want to change the base?

feat etcd: Init etcd client #837

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!

Uh oh!

eskedesu May 9, 2025 •

edited

Loading