TS-2153 : Add -M to traffic_manager options if needed#879
TS-2153 : Add -M to traffic_manager options if needed#879jpeach merged 1 commit intoapache:masterfrom
Conversation
|
[approve ci] |
mgmt/LocalManager.cc
Outdated
| real_proxy_options.append(proxy_options, strlen(proxy_options)); | ||
|
|
||
| if (!strstr(proxy_options, "-M")) { // Make sure we're starting the proxy in mgmt mode | ||
| real_proxy_options.append(" -M ", strlen(" -M ")); |
There was a problem hiding this comment.
I don't think you need to append the trailing space.
There was a problem hiding this comment.
I tested without the trailing space and it worked so I removed it.
|
FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/555/ for details. |
|
Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/451/ for details. |
|
[approve ci] |
|
FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/557/ for details. |
|
Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/453/ for details. |
mgmt/LocalManager.cc
Outdated
|
|
||
| real_proxy_options.append(proxy_options, strlen(proxy_options)); | ||
|
|
||
| if (!strstr(proxy_options, "-M")) { // Make sure we're starting the proxy in mgmt mode |
There was a problem hiding this comment.
This should really be a #define string to guarantee consistency and then use sizeof(M_OPTION_STRING)-1 in the append call.
|
[approve ci] |
|
FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/579/ for details. |
|
Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/475/ for details. |
|
@jpeach we good to land this now? |
…pache#879) The fragment_document_count is an array of size 3. Our logic for accessing it was supposed to clamp indexing into it between values 0 through 2, but accidentally allowed indexing outside of that range. This resulted in an out of bounds index into random memory. This fixes the logic to properly clamp to the appropriate values. For reference here's the old logic before our recent Metrics change: https://github.com/apache/trafficserver/pull/10175/files#diff-6ac65bcc29d9196567a0bbff3c7aa6705ebb7a6041f4a5706b6b475202d4934dL1200 (cherry picked from commit edf70d4)
5 participants
No description provided.