This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new dedfea6 Increase the maximum slice block size from 32MB to 128MB
(#7709)
dedfea6 is described below
commit dedfea69054d13babccb0a10704a582e5b3a6833
Author: Jeff Elsloo <[email protected]>
AuthorDate: Mon Apr 19 09:09:44 2021 -0600
Increase the maximum slice block size from 32MB to 128MB (#7709)
* Increased the maximum slice block size from 32MB to 128MB and added a
unit test to validate blockbytes configuration behavior.
* Adjusted getopt approach in config unit test to ensure it works correctly
on Linux.
(cherry picked from commit b626b472cabfe22e179af2202d4f4276788f453e)
---
doc/admin-guide/plugins/slice.en.rst | 2 +-
plugins/experimental/slice/Config.h | 6 +--
.../experimental/slice/unit-tests/test_config.cc | 63 ++++++++++++++++++++++
3 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/doc/admin-guide/plugins/slice.en.rst
b/doc/admin-guide/plugins/slice.en.rst
index e046689..859b468 100644
--- a/doc/admin-guide/plugins/slice.en.rst
+++ b/doc/admin-guide/plugins/slice.en.rst
@@ -67,7 +67,7 @@ The slice plugin supports the following options::
Default is 1m or 1048576 bytes
-b <bytes> for short.
Suffix k,m,g supported
- Limited to 32k and 32m inclusive.
+ Limited to 32k and 128m inclusive.
--blockbytes-test=<bytes> (optional)
Suffix k,m,g supported
diff --git a/plugins/experimental/slice/Config.h
b/plugins/experimental/slice/Config.h
index 4a5b3d6..e4955f8 100644
--- a/plugins/experimental/slice/Config.h
+++ b/plugins/experimental/slice/Config.h
@@ -30,9 +30,9 @@
// Data Structures and Classes
struct Config {
- static constexpr int64_t const blockbytesmin = 1024 * 256; // 256KB
- static constexpr int64_t const blockbytesmax = 1024 * 1024 * 32; // 32MB
- static constexpr int64_t const blockbytesdefault = 1024 * 1024; // 1MB
+ static constexpr int64_t const blockbytesmin = 1024 * 256; //
256KB
+ static constexpr int64_t const blockbytesmax = 1024 * 1024 * 128; //
128MB
+ static constexpr int64_t const blockbytesdefault = 1024 * 1024; // 1MB
int64_t m_blockbytes{blockbytesdefault};
std::string m_remaphost; // remap host to use for loopback slice GET
diff --git a/plugins/experimental/slice/unit-tests/test_config.cc
b/plugins/experimental/slice/unit-tests/test_config.cc
index b85f381..8f015be 100644
--- a/plugins/experimental/slice/unit-tests/test_config.cc
+++ b/plugins/experimental/slice/unit-tests/test_config.cc
@@ -26,6 +26,7 @@
#include "catch.hpp" /* catch unit-test framework */
#include <array>
+#include <getopt.h>
TEST_CASE("config default", "[AWS][slice][utility]")
{
@@ -84,3 +85,65 @@ TEST_CASE("config bytesfrom invalid parsing",
"[AWS][slice][utility]")
}
}
}
+
+TEST_CASE("config fromargs validate sizes", "[AWS][slice][utility]")
+{
+ char const *const appname = "slice.so";
+ int64_t blockBytesMax = 128 * 1024 * 1024, blockBytesMin = 256 * 1024;
+
+ CHECK(blockBytesMax == Config::blockbytesmax);
+ CHECK(blockBytesMin == Config::blockbytesmin);
+
+ std::vector<std::string> const argkws = {"-b ",
"--blockbytes=", "blockbytes:"};
+ std::vector<std::pair<std::string, bool>> const tests = {{"4m", true},
+ {"1", false},
+ {"32m", true},
+ {"64m", true},
+ {"256k", true},
+ {"128m", true},
+ {"10m", true},
+
{std::to_string(blockBytesMax), true},
+
{std::to_string(blockBytesMax + 1), false},
+
{std::to_string(blockBytesMax - 1), true},
+
{std::to_string(blockBytesMin), true},
+
{std::to_string(blockBytesMin + 1), true},
+
{std::to_string(blockBytesMin - 1), false}};
+
+ for (std::string const &kw : argkws) { // test each argument keyword with
each test pair
+ for (std::pair<std::string, bool> const &test : tests) {
+ // getopt uses global variables; ensure the index is reset each iteration
+ optind = 0;
+
+ // set up args
+ std::vector<char *> argv;
+ std::string arg = kw + test.first;
+ argv.push_back((char *)appname);
+ argv.push_back((char *)arg.c_str());
+
+ // configure slice
+ Config *const config = new Config;
+ config->fromArgs(argv.size(), argv.data());
+
+ // validate that the configured m_blockbytes are what we expect
+ CHECK(test.second == (config->m_blockbytes !=
config->blockbytesdefault));
+
+ // failed; print additional info
+ if (test.second != (config->m_blockbytes != config->blockbytesdefault)) {
+ INFO(test.first.c_str());
+ INFO(config->m_blockbytes);
+ }
+
+ // validate that the result of bytesFrom aligns with the current value
of config->m_blockbytes as expected
+ int64_t const blockbytes = config->bytesFrom(test.first.c_str());
+ CHECK(test.second == (config->m_blockbytes == blockbytes));
+
+ // failed; print additional info
+ if (test.second != (config->m_blockbytes == blockbytes)) {
+ INFO(blockbytes);
+ INFO(config->m_blockbytes);
+ }
+
+ delete config;
+ }
+ }
+}
