Skip to content

Commit

Permalink
Add option for admission control for filesystem resources
Browse files Browse the repository at this point in the history
Summary:
This change adds a generic admission controller class that can be
used for filesystem resources like read bytes in flight or number
of read requests in flight. It also provides a way to report stats
for resource usage, queued count, queued wait times by allowing the
client to specify a metric name.

Differential Revision: D59643306
  • Loading branch information
Bikramjeet Vig authored and facebook-github-bot committed Jul 11, 2024
1 parent ba8d27d commit f3baba4
Show file tree
Hide file tree
Showing 5 changed files with 206 additions and 0 deletions.
1 change: 1 addition & 0 deletions velox/dwio/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ add_library(
ExecutorBarrier.cpp
FileSink.cpp
FlatMapHelper.cpp
GenericAdmissionController.cpp
OnDemandUnitLoader.cpp
InputStream.cpp
IntDecoder.cpp
Expand Down
81 changes: 81 additions & 0 deletions velox/dwio/common/GenericAdmissionController.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "velox/dwio/common/GenericAdmissionController.h"

#include "velox/common/base/StatsReporter.h"
#include "velox/common/time/Timer.h"

namespace facebook::velox::dwio::common {

void GenericAdmissionController::accept(uint64_t resourceUnits) {
ContinueFuture future;
uint64_t updatedValue = 0;
{
std::lock_guard<std::mutex> l(mtx);
if (unitsUsed_ + resourceUnits > config_.maxLimit) {
auto [unblockPromise, unblockFuture] = makeVeloxContinuePromiseContract();
Request req{resourceUnits};
req.promise = std::move(unblockPromise);
queue_.push_back(std::move(req));
future = std::move(unblockFuture);
} else {
updatedValue = unitsUsed_ += resourceUnits;
}
}
if (future.valid()) {
if (!config_.resourceQueuedCountMetric.empty()) {
RECORD_METRIC_VALUE(config_.resourceQueuedCountMetric);
}
uint64_t waitTimeUs{0};
{
MicrosecondTimer timer(&waitTimeUs);
future.wait();
}
if (!config_.resourceQueuedTimeMsMetric.empty()) {
RECORD_HISTOGRAM_METRIC_VALUE(
config_.resourceQueuedTimeMsMetric, waitTimeUs / 1'000);
}
return;
}
// Only upadate if there was no wait, as the releasing thread is responsible
// for updating the metric.
if (!config_.resourceUsageMetric.empty()) {
RECORD_METRIC_VALUE(config_.resourceUsageMetric, updatedValue);
}
}

void GenericAdmissionController::release(uint64_t resourceUnits) {
uint64_t updatedValue = 0;
{
std::lock_guard<std::mutex> l(mtx);
unitsUsed_ -= resourceUnits;
while (!queue_.empty()) {
auto& request = queue_.front();
if (unitsUsed_ + request.unitsRequested > config_.maxLimit) {
break;
}
unitsUsed_ += request.unitsRequested;
request.promise.setValue();
queue_.pop_front();
}
updatedValue = unitsUsed_;
}
if (!config_.resourceUsageMetric.empty()) {
RECORD_METRIC_VALUE(config_.resourceUsageMetric, updatedValue);
}
}
} // namespace facebook::velox::dwio::common
63 changes: 63 additions & 0 deletions velox/dwio/common/GenericAdmissionController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once

#include <deque>
#include <mutex>
#include "velox/common/future/VeloxPromise.h"

namespace facebook::velox::dwio::common {

/// A generic admission controller that can be used to limit the number of
/// resources in use and can log metrics like resource usage, queued count,
/// queued wait times. When a calling thread's request for resources surpasses
/// the set limit, it will be placed in a FIFO queue. The thread must then wait
/// until sufficient resources are freed by other threads, addressing all
/// preceding requests in the queue, before its own request can be granted.
class GenericAdmissionController {
public:
struct Config {
uint64_t maxLimit;
/// The metric name for resource usage. If not set, it will not be reported.
std::string resourceUsageMetric;
/// The metric name for resource queued count. If not set, it will not be
/// reported
std::string resourceQueuedCountMetric;
/// The metric name for resource queued wait time. If not set, it will not
/// be reported
std::string resourceQueuedTimeMsMetric;
};
explicit GenericAdmissionController(Config config) : config_(config) {}

void accept(uint64_t resourceUnits);
void release(uint64_t resourceUnits);

uint64_t currentResourceUsage() const {
std::lock_guard<std::mutex> l(mtx);
return unitsUsed_;
}

private:
struct Request {
uint64_t unitsRequested;
ContinuePromise promise;
};
Config config_;
mutable std::mutex mtx;
uint64_t unitsUsed_{0};
std::deque<Request> queue_;
};
} // namespace facebook::velox::dwio::common
1 change: 1 addition & 0 deletions velox/dwio/common/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ add_executable(
DataBufferTests.cpp
DecoderUtilTest.cpp
ExecutorBarrierTest.cpp
GenericAdmissionControllerTest.cpp
OnDemandUnitLoaderTests.cpp
LocalFileSinkTest.cpp
MemorySinkTest.cpp
Expand Down
60 changes: 60 additions & 0 deletions velox/dwio/common/tests/GenericAdmissionControllerTest.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "velox/dwio/common/GenericAdmissionController.h"
#include <gtest/gtest.h>
#include <atomic>

using namespace facebook::velox;
namespace facebook::velox::dwio::common {
TEST(GenericAdmissionController, basic) {
GenericAdmissionController::Config config{.maxLimit = 100000};
GenericAdmissionController admissionController(config);
EXPECT_EQ(admissionController.currentResourceUsage(), 0);

admissionController.accept(100);
EXPECT_EQ(admissionController.currentResourceUsage(), 100);

admissionController.accept(100);
EXPECT_EQ(admissionController.currentResourceUsage(), 200);

admissionController.release(100);
EXPECT_EQ(admissionController.currentResourceUsage(), 100);
}

TEST(GenericAdmissionController, multiThreaded) {
// Ensure that resource usage never exceeds the limit set in the admission
// controller.
const uint64_t kLimit = 10;
std::atomic_uint64_t currentUsage{0};
GenericAdmissionController::Config config{.maxLimit = 10};
GenericAdmissionController admissionController(config);

std::vector<std::thread> threads;
for (int i = 0; i < 20; i++) {
threads.push_back(std::thread([&]() {
for (int j = 0; j < 1000; j++) {
admissionController.accept(1);
uint64_t curr = currentUsage.fetch_add(1);
ASSERT_LE(curr + 1, kLimit);
currentUsage--;
admissionController.release(1);
}
}));
}
for (auto& thread : threads) {
thread.join();
}
}
} // namespace facebook::velox::dwio::common

0 comments on commit f3baba4

Please sign in to comment.