Skip to content

Commit

Permalink
fix:Revise the value check for max-rsync-parallel-num to prevent a co…
Browse files Browse the repository at this point in the history 
…re dump when it is set to a value greater than 4 (#2595)

* revised value check of max-rsync-parallel-num to avoid core dump when it's value greater than 4

* avoid fixed num, use kMaxRsyncParallelNum instead

* use kMaxRsyncParallelNum to replace another two fixed num 4

---------

Co-authored-by: cjh <[email protected]>
 Author:    cheniujh <[email protected]>
  • Loading branch information
@cheniujh @brother-jin
cheniujh authored and brother-jin committed May 15, 2024
1 parent 1b5783f commit 5caad1c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions conf/pika.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,10 +439,14 @@ default-slot-num : 1024
# [USED BY SLAVE] The transmitting speed(Rsync Rate) In full replication is controlled BY SLAVE NODE, You should modify the throttle-bytes-per-second in slave's pika.conf if you wanna change the rsync rate limit.
# [Dynamic Change Supported] send command 'config set throttle-bytes-per-second new_value' to SLAVE NODE can dynamically adjust rsync rate during full sync(use config rewrite can persist the changes).
throttle-bytes-per-second : 207200000
<<<<<<< HEAD
# Rsync timeout in full sync stage[Default value is 1000 ms], unnecessary retries will happen if this value is too small.
# [Dynamic Change Supported] similar to throttle-bytes-per-second, rsync-timeout-ms can be dynamically changed by configset command
# [USED BY SLAVE] Similar to throttle-bytes-per-second, you should change rsync-timeout-ms's value in slave's conf file if it is needed to adjust.
rsync-timeout-ms : 1000
=======

>>>>>>> b58beb09 (fix:Revise the value check for max-rsync-parallel-num to prevent a core dump when it is set to a value greater than 4 (#2595))
# The valid range for max-rsync-parallel-num is [1, 4].
# If an invalid value is provided, max-rsync-parallel-num will automatically be reset to 4.
max-rsync-parallel-num : 4
Expand Down

1 comment on commit 5caad1c

@sqgongtran
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pika.conf 包含了
<<<<<<< HEAD

=======

b58beb0 (fix:Revise the value check for max-rsync-parallel-num to prevent a core dump when it is set to a value greater than 4 (#2595))

？？？

Please sign in to comment.