Skip to content

bind_hash_mapping sampling logging changes w.r.t. longer corrid #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vineravi wants to merge 8 commits into from
Closed

bind_hash_mapping sampling logging changes w.r.t. longer corrid #414

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da94d6d
instead of flow based control added valid transition map to control s…
rasamala83 Dec 18, 2024
bc63e12
added missing transtion from finish state to scheduled state
rasamala83 Dec 18, 2024
d1c94c5
move process reaping login go from C
rasamala83 Dec 19, 2024
912e18b
fixing race condition related to worker recovery issue
rasamala83 Jan 17, 2025
b184043
removed unwanted changes related to induced delays during execution
rasamala83 Jan 20, 2025
6d78baf
Revert "first version of changes to avoid accidental worker state upd…
rasamala83 Feb 4, 2025
0e8b98c
Non graceful worker recovery issues and workflow issue (#411)
rasamala83 Feb 5, 2025
ca0ae60
bind_hash_mapping sampling logging changes w.r.t. longer corrid
Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions worker/cppworker/worker/OCCChild.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,11 +1056,27 @@ int OCCChild::handle_command(const int _cmd, std::string &_line)
{
if (config->is_switch_enabled("enable_bind_hash_logging", false)) {
bool skip = false;
if (m_corr_id.length() > 16) { // Max hex value that can be stored in ULLONG_MAX (FFFFFFFFFFFFFFFF)
if (m_corr_id.length() > 16 && m_corr_id.length() != 32) { // Max hex value that can be stored in ULLONG_MAX (FFFFFFFFFFFFFFFF); corrid.length() != 32 checked to handle new corrid with length 32
skip = true; // Reduce the logging noise.
}
if (!skip) {
unsigned long long int corrid = strtoull(m_corr_id.c_str(), NULL , 16);
unsigned long long int corrid;
unsigned long long int corrIdMsbVal;
unsigned long long int corrIdLsbVal;
bool longCorrId = false;
std::string corrIdMsb;
std::string corrIdLsb;

if (m_corr_id.length() == 32) {
longCorrId = true;
corrIdMsb = m_corr_id.substr(0, 16); // First 16 digits (Most Significant)
corrIdLsb = m_corr_id.substr(16, 16); // Last 16 digits (Least Significant)
corrIdMsbVal = strtoull(corrIdMsb.c_str(), NULL, 16);
corrIdLsbVal = strtoull(corrIdLsb.c_str(), NULL, 16);
} else {
corrid = strtoull(m_corr_id.c_str(), NULL , 16);
}

if (errno == ERANGE) {
std::ostringstream msg;
msg << "m_err=error on strtoull(), errno=" << errno;
Expand All @@ -1072,7 +1088,7 @@ int OCCChild::handle_command(const int _cmd, std::string &_line)
e_name.AddData("corr_id_", m_corr_id);
e_name.Completed();
}
if (!skip && (bit_mask == (corrid & bit_mask))) { // Allow
if (!skip && ((longCorrId && (bit_mask == (corrIdMsbVal & bit_mask)) && (bit_mask == (corrIdLsbVal & bit_mask))) || (!longCorrId && bit_mask == (corrid & bit_mask)))) { // Allow
if (bind_array->size() > 0) {
// Skip SQL with large number of binds
if (bind_array->size() > 5 || bind_array->at(0).get()->array_row_num > 1) {
Expand Down