Skip to content

Add pool-source flag for DB connections #20

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

Open
mszabo-wikia wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −0
Open

Add pool-source flag for DB connections #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions squangle/mysql_client/Connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,16 @@ class Connection {
return mysql_connection_->getLastActivityTime();
}

// Pool-source observability
[[nodiscard]] bool wasFromPoolHit() const {
CHECK_THROW(mysql_connection_ != nullptr, db::InvalidConnectionException);
return mysql_connection_->wasFromPoolHit();
}
[[nodiscard]] bool wasReusedWithChangeUser() const {
CHECK_THROW(mysql_connection_ != nullptr, db::InvalidConnectionException);
return mysql_connection_->wasReusedWithChangeUser();
}

// Returns the MySQL server version. If the connection has been closed
// an error is generated.
[[nodiscard]] std::string serverInfo() const {
Expand Down
16 changes: 16 additions & 0 deletions squangle/mysql_client/ConnectionHolder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,20 @@ class ConnectionHolder : public InternalConnection {
return lastActiveTime_;
}

// Pool-source observability flags
void setFromPoolHit(bool v) {
fromPoolHit_ = v;
}
[[nodiscard]] bool wasFromPoolHit() const {
return fromPoolHit_;
}
void setReusedWithChangeUser(bool v) {
reusedWithChangeUser_ = v;
}
[[nodiscard]] bool wasReusedWithChangeUser() const {
return reusedWithChangeUser_;
}

[[nodiscard]] std::shared_ptr<const ConnectionKey> getKey() const {
return key_;
}
Expand Down Expand Up @@ -280,6 +294,8 @@ class ConnectionHolder : public InternalConnection {
bool opened_{false};
Timepoint createTime_;
Timepoint lastActiveTime_;
bool fromPoolHit_{false};
bool reusedWithChangeUser_{false};
};

} // namespace facebook::common::mysql_client
6 changes: 6 additions & 0 deletions squangle/mysql_client/ConnectionPool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,8 @@ class ConnectionPool
// Cache hit
stats()->incrPoolHits();

// mark handout as coming from pool cache
mysql_conn->setFromPoolHit(true);
mysql_conn->setReusable(true);
raw_pool_op->connectionCallback(std::move(mysql_conn));
}
Expand Down Expand Up @@ -631,6 +633,8 @@ class ConnectionPool
stats()->incrPoolHits();
stats()->incrPoolHitsChangeUser();

pooledConn->setFromPoolHit(true);
pooledConn->setReusedWithChangeUser(true);
pooledConn->setReusable(true);
rawPoolOp->connectionCallback(std::move(pooledConn));
});
Expand Down Expand Up @@ -820,6 +824,8 @@ class ConnectionPool
VLOG(11) << "No operations waiting for Connection, enqueueing it";
conn_storage_.queueConnection(std::move(mysql_conn));
} else {
// Flag as hit when recycled (brand_new == false); miss when just created.
mysql_conn->setFromPoolHit(!brand_new);
mysql_conn->setReusable(true);
pool_op->connectionCallback(std::move(mysql_conn));
}
Expand Down