fix: resolve upstream conflicts and address PR 3535 feedback - #53
Open
Spicy-cream wants to merge 26 commits into
Open
Spicy-cream wants to merge 26 commits into
Spicy-cream wants to merge 26 commits into
Conversation
Validate packet payload lengths before reading the response type byte. This prevents an empty packet from borrowing the first byte of a following packet during response parsing.
* feat: limit Redis server connections * feat: update Redis connection limit at runtime * fix: handle partial Redis rejection writes * Fix Redis connection limit review nits Accept fd 0 in the Redis connection tests and describe every dedicated-listener requirement in startup and runtime errors. Validation: brpc_server_unittest rebuilt; dedicated-listener, plaintext/dynamic-limit, pre-TLS rejection, and idle-connection tests passed (4/4). Diff whitespace check passed. Full suite not run. * Clarify Redis rejection ownership and response delivery Document that rejection borrows the fd from the accept loop guard, which closes it on continue. Describe nonblocking best-effort error delivery in both server guides. Accumulate short TCP reads in rejection tests and verify plaintext EOF. Validation: rebuilt brpc_server_unittest; dedicated-listener, plaintext/dynamic-limit, pre-TLS rejection and idle-connection tests passed (4/4). Merge-base diff whitespace check passed. Full suite not run. Production behavior is unchanged. * Improve Redis rejection portability and regression coverage Guard MSG_NOSIGNAL and use SO_NOSIGPIPE when available; omit the optional error if per-socket signal suppression is unavailable. Share listener validation diagnostics, use RAII based on actual Server ownership in the invalid-configuration test, and verify new admission after slot recovery. Validation: cmake --build build --target brpc_server_unittest --parallel 4 succeeded. Dedicated-listener, plaintext/dynamic-limit/slot-recovery, pre-TLS rejection, and idle-connection tests passed (4/4). Merge-base diff check passed. Full suite and macOS fallback were not run. * Generalize connection limits to public listeners * Address connection limit review feedback
* Relax timer thread stop latency check Keep verifying that stop_and_join wakes the timer thread instead of waiting for future tasks, while allowing for CI runner scheduling delays. * Wait for shutdown write callbacks in socket test Wait for every write callback before failing and releasing the socket. Stop repeated runs after the first failure and bound the initial wait.
* Escape HTML output in builtin /flags service
The ?setvalue= confirmation message and the ?setvalue&withform page
wrote the gflag name/value into the html page without escaping, unlike
the flag list page which already escapes values with HtmlReplace.
Escape them with WebEscape like rpcz_service does. Plain text output
is unchanged.
* Use FlagSaver in flags_escaping unittest
Replace the manual save/restore of the modified gflag with
GFLAGS_NAMESPACE::FlagSaver so the flag value is restored on every
exit of the test, following the established pattern in
brpc_http_rpc_protocol_unittest.cpp.
* Scope req/res per sub-case in flags_escaping unittest
Declare FlagsRequest/FlagsResponse inside each { ... } block so no
state can leak between the default_method invocations.
… its multi dimension version (apache#3549) * Make Prometheus latency output consistent between LatencyRecorder and its multi dimension version * Opt MultiDimension::dump_impl
* Document Debug CMake build on Apple Silicon * Fix formatting and clarify CMake usage for brpc Update instructions for using CMake to compile Debug version of brpc on Apple Silicon. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Address CMake documentation review --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
* Add URMA transport support * fix: address review comments on naming, IOBuf sizing and UMDK pinning - Rename ack_bit_is_rdma_ok to ack_bit_is_urma_ok. - Replace hard-coded IOBuf block header size with sizeof(butil::IOBuf::Block). - Pin UMDK dependency to a specific commit instead of a mutable tag. * modify the bazel docs and refine the ut * add DOWNLOAD_URMA_HEADERS lacks Bazel build support * Fix Bazel URMA mock source selection * Fix URMA review issues after input refactor * Clarify Bazel URMA source selection * force Restore InputMessenger formatting * reformat the code base on master --------- Co-authored-by: Winchell <cw20050111@gmail.com> Co-authored-by: Gzure <740684863@qq.com>
* Fix ineffective enable_if constraints in bvar and butil * Add reset UT * Use std::enable_if_t instead of std::enable_if::type * Opt BabylonVariable::reset() comment
Validate sleep and join semantics directly. Avoid requiring worker threads to resume within a narrow scheduling window.
Remove the 5 ms completion-time assertion from the stop-before-running test. Scheduler latency is not part of the tested API contract, while the existing assertions still verify interruption, joining, and repeated stop behavior.
* Add UBRing data format negotiation (apache#34) * Fix unaligned UBRing ACK access * Use direct list initialization for HelloMessage --------- Co-authored-by: BGQ99 <1132767344@qq.com>
…#3551) * Fix two races between butex_wait() and TaskGroup::interrupt() * Fix self-deadlock in wait_for_butex() when TimerThread::schedule() fails
* Fix use-after-free in RTMP test sender lifetime management * Fix skipped bthread_stop * Make the ownership clear
Spicy-cream
force-pushed
the
review/pr3535-resolve-conflicts
branch
from
September 22, 2026 09:11
acf4de7 to
e1dd3f0
Compare
Spicy-cream
force-pushed
the
review/pr3535-resolve-conflicts
branch
from
September 22, 2026 09:57
e1dd3f0 to
d02ed85
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge current apache/brpc master into the transport-handshake branch, preserve upstream URMA support and UBSHM v3 format negotiation, simplify the handshake design document, and restore four-space indentation in the RDMA tests. Local handshake, RDMA, UBSHM, and URMA mock tests passed.