etcd.rs 13.2 KB
Newer Older
1
// SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2
3
4
5
6
7
// SPDX-License-Identifier: Apache-2.0

use std::collections::HashMap;
use std::pin::Pin;
use std::time::Duration;

8
use crate::transports::etcd;
9
10
use async_stream::stream;
use async_trait::async_trait;
11
use etcd_client::{Compare, CompareOp, EventType, PutOptions, Txn, TxnOp, WatchOptions};
12

13
use super::{Bucket, Key, KeyValue, Store, StoreError, StoreOutcome, WatchEvent};
14
15

#[derive(Clone)]
16
pub struct EtcdStore {
17
    client: etcd::Client,
18
19
}

20
impl EtcdStore {
21
    pub fn new(client: etcd::Client) -> Self {
22
        Self { client }
23
24
25
26
    }
}

#[async_trait]
27
impl Store for EtcdStore {
28
29
    type Bucket = EtcdBucket;

30
31
32
33
34
    /// A "bucket" in etcd is a path prefix
    async fn get_or_create_bucket(
        &self,
        bucket_name: &str,
        _ttl: Option<Duration>, // TODO ttl not used yet
35
36
37
38
39
    ) -> Result<Self::Bucket, StoreError> {
        Ok(EtcdBucket {
            client: self.client.clone(),
            bucket_name: bucket_name.to_string(),
        })
40
41
42
43
    }

    /// A "bucket" in etcd is a path prefix. This creates an EtcdBucket object without doing
    /// any network calls.
44
45
    async fn get_bucket(&self, bucket_name: &str) -> Result<Option<Self::Bucket>, StoreError> {
        Ok(Some(EtcdBucket {
46
47
            client: self.client.clone(),
            bucket_name: bucket_name.to_string(),
48
        }))
49
    }
50
51

    fn connection_id(&self) -> u64 {
52
        self.client.lease_id()
53
    }
54
55
56
57

    fn shutdown(&self) {
        // Revoke the lease? etcd will do it for us on disconnect.
    }
58
59
60
}

pub struct EtcdBucket {
61
    client: etcd::Client,
62
63
64
65
    bucket_name: String,
}

#[async_trait]
66
impl Bucket for EtcdBucket {
67
68
    async fn insert(
        &self,
69
        key: &Key,
70
        value: bytes::Bytes,
71
72
        // "version" in etcd speak. revision is a global cluster-wide value
        revision: u64,
73
    ) -> Result<StoreOutcome, StoreError> {
74
75
        let version = revision;
        if version == 0 {
76
            self.create(key, value).await
77
        } else {
78
            self.update(key, value, version).await
79
80
81
        }
    }

82
    async fn get(&self, key: &Key) -> Result<Option<bytes::Bytes>, StoreError> {
83
        let k = make_key(&self.bucket_name, key);
84
85
86
87
88
89
        tracing::trace!("etcd get: {k}");

        let mut kvs = self
            .client
            .kv_get(k, None)
            .await
90
            .map_err(|e| StoreError::EtcdError(e.to_string()))?;
91
92
93
94
95
96
97
        if kvs.is_empty() {
            return Ok(None);
        }
        let (_, val) = kvs.swap_remove(0).into_key_value();
        Ok(Some(val.into()))
    }

98
    async fn delete(&self, key: &Key) -> Result<(), StoreError> {
99
100
        let k = make_key(&self.bucket_name, key);
        tracing::trace!("etcd delete: {k}");
101
102
        let _ = self
            .client
103
            .kv_delete(k, None)
104
            .await
105
            .map_err(|e| StoreError::EtcdError(e.to_string()))?;
106
107
108
109
110
        Ok(())
    }

    async fn watch(
        &self,
111
112
113
    ) -> Result<Pin<Box<dyn futures::Stream<Item = WatchEvent> + Send + 'life0>>, StoreError> {
        let prefix = make_key(&self.bucket_name, &"".into());
        tracing::trace!("etcd watch: {prefix}");
114
        let watcher = self
115
            .client
116
            .kv_watch_prefix(&prefix)
117
            .await
118
            .map_err(|e| StoreError::EtcdError(e.to_string()))?;
119
        let (_, mut watch_stream) = watcher.dissolve();
120
        let output = stream! {
121
122
123
124
125
            while let Some(event) = watch_stream.recv().await {
                match event {
                    etcd::WatchEvent::Put(kv) => {
                        let (k, v) = kv.into_key_value();
                        let key = match String::from_utf8(k) {
126
                            Ok(k) => Key::new(k),
127
128
129
130
131
132
133
134
135
136
137
                            Err(err) => {
                                tracing::error!(%err, prefix, "Invalid UTF8 in etcd key");
                                continue;
                            }
                        };
                        let item = KeyValue::new(key, v.into());
                        yield WatchEvent::Put(item);
                    }
                    etcd::WatchEvent::Delete(kv) => {
                        let (k, _) = kv.into_key_value();
                        let key = match String::from_utf8(k) {
138
                            Ok(k) => Key::new(k),
139
140
141
142
143
                            Err(err) => {
                                tracing::error!(%err, prefix, "Invalid UTF8 in etcd key");
                                continue;
                            }
                        };
144
                        yield WatchEvent::Delete(key);
145
146
147
148
149
150
151
                    }
                }
            }
        };
        Ok(Box::pin(output))
    }

152
    async fn entries(&self) -> Result<HashMap<Key, bytes::Bytes>, StoreError> {
153
        let k = make_key(&self.bucket_name, &"".into());
154
155
156
157
158
159
        tracing::trace!("etcd entries: {k}");

        let resp = self
            .client
            .kv_get_prefix(k)
            .await
160
            .map_err(|e| StoreError::EtcdError(e.to_string()))?;
161
        let out: HashMap<Key, bytes::Bytes> = resp
162
163
164
            .into_iter()
            .map(|kv| {
                let (k, v) = kv.into_key_value();
165
                (Key::new(String::from_utf8_lossy(&k).to_string()), v.into())
166
167
168
169
170
171
172
173
            })
            .collect();

        Ok(out)
    }
}

impl EtcdBucket {
174
175
176
177
178
    async fn create(
        &self,
        key: &Key,
        value: impl Into<Vec<u8>>,
    ) -> Result<StoreOutcome, StoreError> {
179
        let k = make_key(&self.bucket_name, key);
180
181
        tracing::trace!("etcd create: {k}");

182
        match self
183
            .client
184
            .kv_create(k.as_str(), value.into(), None)
185
            .await
186
            .map_err(|e| StoreError::EtcdError(e.to_string()))?
187
        {
188
189
190
191
192
            None => {
                // Key was created successfully
                Ok(StoreOutcome::Created(1)) // version of new key is always 1
            }
            Some(revision) => Ok(StoreOutcome::Exists(revision)),
193
        }
194
195
196
197
    }

    async fn update(
        &self,
198
        key: &Key,
199
        value: impl AsRef<[u8]>,
200
        revision: u64,
201
    ) -> Result<StoreOutcome, StoreError> {
202
        let version = revision;
203
        let k = make_key(&self.bucket_name, key);
204
205
206
207
208
209
        tracing::trace!("etcd update: {k}");

        let kvs = self
            .client
            .kv_get(k.clone(), None)
            .await
210
            .map_err(|e| StoreError::EtcdError(e.to_string()))?;
211
        if kvs.is_empty() {
212
            return Err(StoreError::MissingKey(key.to_string()));
213
214
215
216
217
218
        }
        let current_version = kvs.first().unwrap().version() as u64;
        if current_version != version + 1 {
            tracing::warn!(
                current_version,
                attempted_next_version = version,
219
                %key,
220
221
222
223
224
225
                "update: Wrong revision"
            );
            // NATS does a resync_update, overwriting the key anyway and getting the new revision.
            // So we do too in etcd.
        }

226
        let put_options = PutOptions::new()
227
            .with_lease(self.client.lease_id() as i64)
228
            .with_prev_key();
229
230
        let mut put_resp = self
            .client
231
            .kv_put_with_options(k, value, Some(put_options))
232
            .await
233
            .map_err(|e| StoreError::EtcdError(e.to_string()))?;
234
235
236
237
238
        Ok(match put_resp.take_prev_key() {
            // Should this be an error?
            // The key was deleted between our get and put. We re-created it.
            // Version of new key is always 1.
            // <https://etcd.io/docs/v3.5/learning/data_model/>
239
            None => StoreOutcome::Created(1),
240
            // Expected case, success
241
            Some(kv) if kv.version() as u64 == version + 1 => StoreOutcome::Created(version),
242
            // Should this be an error? Something updated the version between our get and put
243
            Some(kv) => StoreOutcome::Created(kv.version() as u64 + 1),
244
245
246
247
        })
    }
}

248
fn make_key(bucket_name: &str, key: &Key) -> String {
249
    [bucket_name.to_string(), key.to_string()].join("/")
250
}
251
252
253
254
255

#[cfg(feature = "integration")]
#[cfg(test)]
mod concurrent_create_tests {
    use super::*;
256
257
    use crate::Runtime;
    use crate::transports::etcd as etcd_transport;
258
259
260
261
262
263
264
265
266
    use std::sync::Arc;
    use tokio::sync::Barrier;

    #[test]
    fn test_concurrent_etcd_create_race_condition() {
        let rt = Runtime::from_settings().unwrap();
        let rt_clone = rt.clone();

        rt_clone.primary().block_on(async move {
267
268
269
270
271
272
            let etcd_client =
                etcd_transport::Client::new(etcd_transport::ClientOptions::default(), rt)
                    .await
                    .unwrap();
            let storage = crate::storage::kv::Manager::etcd(etcd_client);
            test_concurrent_create(&storage).await.unwrap();
273
274
275
        });
    }

276
277
278
    async fn test_concurrent_create(
        storage: &crate::storage::kv::Manager,
    ) -> Result<(), StoreError> {
279
280
281
282
283
284
285
286
287
288
289
290
        // Create a bucket for testing
        let bucket = Arc::new(tokio::sync::Mutex::new(
            storage
                .get_or_create_bucket("test_concurrent_bucket", None)
                .await?,
        ));

        // Number of concurrent workers
        let num_workers = 10;
        let barrier = Arc::new(Barrier::new(num_workers));

        // Shared test data
291
        let test_key: Key = Key::new(format!("concurrent_test_key_{}", uuid::Uuid::new_v4()));
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
        let test_value = "test_value";

        // Spawn multiple tasks that will all try to create the same key simultaneously
        let mut handles = Vec::new();
        let success_count = Arc::new(tokio::sync::Mutex::new(0));
        let exists_count = Arc::new(tokio::sync::Mutex::new(0));

        for worker_id in 0..num_workers {
            let bucket_clone = bucket.clone();
            let barrier_clone = barrier.clone();
            let key_clone = test_key.clone();
            let value_clone = format!("{}_from_worker_{}", test_value, worker_id);
            let success_count_clone = success_count.clone();
            let exists_count_clone = exists_count.clone();

            let handle = tokio::spawn(async move {
                // Wait for all workers to be ready
                barrier_clone.wait().await;

                // All workers try to create the same key at the same time
                let result = bucket_clone
                    .lock()
                    .await
315
                    .insert(&key_clone, value_clone.into(), 0)
316
317
318
                    .await;

                match result {
319
                    Ok(StoreOutcome::Created(version)) => {
320
321
322
323
324
325
326
327
                        println!(
                            "Worker {} successfully created key with version {}",
                            worker_id, version
                        );
                        let mut count = success_count_clone.lock().await;
                        *count += 1;
                        Ok(version)
                    }
328
                    Ok(StoreOutcome::Exists(version)) => {
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
                        println!(
                            "Worker {} found key already exists with version {}",
                            worker_id, version
                        );
                        let mut count = exists_count_clone.lock().await;
                        *count += 1;
                        Ok(version)
                    }
                    Err(e) => {
                        println!("Worker {} got error: {:?}", worker_id, e);
                        Err(e)
                    }
                }
            });

            handles.push(handle);
        }

        // Wait for all workers to complete
        let mut results = Vec::new();
        for handle in handles {
            let result = handle.await.unwrap();
            if let Ok(version) = result {
                results.push(version);
            }
        }

        // Verify results
        let final_success_count = *success_count.lock().await;
        let final_exists_count = *exists_count.lock().await;

        println!(
            "Final counts - Created: {}, Exists: {}",
            final_success_count, final_exists_count
        );

        // CRITICAL ASSERTIONS:
        // 1. Exactly ONE worker should have successfully created the key
        assert_eq!(
            final_success_count, 1,
            "Exactly one worker should create the key"
        );

        // 2. All other workers should have gotten "Exists" response
        assert_eq!(
            final_exists_count,
            num_workers - 1,
            "All other workers should see key exists"
        );

        // 3. Total successful operations should equal number of workers
        assert_eq!(
            results.len(),
            num_workers,
            "All workers should complete successfully"
        );

        // 4. Verify the key actually exists in etcd
        let stored_value = bucket.lock().await.get(&test_key).await?;
        assert!(stored_value.is_some(), "Key should exist in etcd");

        // 5. The stored value should be from one of the workers
        let stored_str = String::from_utf8(stored_value.unwrap().to_vec()).unwrap();
        assert!(
            stored_str.starts_with(test_value),
            "Stored value should match expected prefix"
        );

        // Clean up
        bucket.lock().await.delete(&test_key).await?;

        Ok(())
    }
}