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

chore: pull helio #3350

Merged
merged 2 commits into from
Jul 21, 2024
Merged

chore: pull helio #3350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4194071
chore: pull helio
romange Jul 21, 2024
725bc46
fix: tests
romange Jul 21, 2024
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
2 changes: 1 addition & 1 deletion helio
Open in desktop
Submodule helio updated 38 files
+1 −1 cmake/third_party.cmake
+3 −0 examples/CMakeLists.txt
+89 −0 examples/gcs_demo.cc
+1 −1 strings/CMakeLists.txt
+41 −0 strings/escaping.cc
+13 −0 strings/escaping.h
+1 −0 util/CMakeLists.txt
+1 −0 util/cloud/CMakeLists.txt
+3 −0 util/cloud/gcp/CMakeLists.txt
+64 −0 util/cloud/gcp/gcp_creds_provider.h
+135 −0 util/cloud/gcp/gcp_utils.cc
+124 −0 util/cloud/gcp/gcp_utils.h
+498 −0 util/cloud/gcp/gcs.cc
+47 −0 util/cloud/gcp/gcs.h
+264 −0 util/cloud/gcp/gcs_file.cc
+22 −0 util/cloud/gcp/gcs_file.h
+4 −3 util/fiber_socket_base.h
+4 −2 util/fibers/epoll_socket.cc
+2 −1 util/fibers/epoll_socket.h
+8 −1 util/fibers/uring_proactor.cc
+6 −5 util/fibers/uring_socket.cc
+3 −2 util/fibers/uring_socket.h
+1 −13 util/http/CMakeLists.txt
+0 −127 util/http/beast_rj_utils.h
+10 −5 util/http/http_client.cc
+20 −5 util/http/http_client.h
+0 −90 util/http/http_test.cc
+0 −31 util/http/http_testing.cc
+0 −23 util/http/http_testing.h
+0 −179 util/http/https_client.cc
+0 −202 util/http/https_client.h
+26 −20 util/http/https_client_pool.cc
+38 −27 util/http/https_client_pool.h
+29 −33 util/tls/tls_engine.cc
+13 −4 util/tls/tls_engine.h
+6 −7 util/tls/tls_engine_test.cc
+141 −82 util/tls/tls_socket.cc
+5 −2 util/tls/tls_socket.h
2 changes: 2 additions & 0 deletions src/server/engine_shard_set.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,8 @@ void EngineShard::RunPeriodic(std::chrono::milliseconds period_ms) {

// Every 8 runs, update the global stats.
if (global_count % 8 == 0) {
DVLOG(2) << "Global periodic";

uint64_t sum = 0;
const auto& stats = EngineShardSet::GetCachedStats();
for (const auto& s : stats)
Expand Down
5 changes: 3 additions & 2 deletions src/server/tiered_storage_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,10 @@ TEST_F(TieredStorageTest, BackgroundOffloading) {

// Wait for offload to do it all again
ExpectConditionWithinTimeout([&] { return GetMetrics().db_stats[0].tiered_entries == kNum; });

auto resp = Run({"INFO", "ALL"});
LOG(INFO) << "INFO " << resp.GetString();
auto metrics = GetMetrics();
EXPECT_EQ(metrics.tiered_stats.total_stashes, 2 * kNum);
EXPECT_EQ(metrics.tiered_stats.total_stashes, 2 * kNum) << resp.GetString();
EXPECT_EQ(metrics.tiered_stats.total_fetches, kNum);
EXPECT_EQ(metrics.tiered_stats.allocated_bytes, kNum * 4096);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/dragonfly/connection_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ async def test_parser_memory_stats(df_server, async_client: aioredis.Redis):
await writer.drain()
# writer is pending because the request is not finished.
stats = await async_client.execute_command("memory stats")
assert stats["connections.direct_bytes"] > 150000
assert stats["connections.direct_bytes"] > 130000


async def test_reject_non_tls_connections_on_tls(with_tls_server_args, df_factory):
Expand Down
Loading