mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

[5586] MySQL shared leases stats implemented

Browse Source 
src/share/database/scripts/mysql/dhcpdb_create.mysql
    src/share/database/scripts/mysql/dhcpdb_drop.mysql
    src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh.in
        Added MySQL v4/6 stat tables and triggers

    src/lib/dhcpsrv/memfile_lease_mgr.cc
        Suppress output of of rows with count values of 0

    src/lib/dhcpsrv/mysql_lease_mgr.*
        Added v4/v6 lease stat SQL statements

        MySqlLeaseStatsQuery
        - Added ctor variants that accomodate selection criteria
        - Modified start() to handle three variants of selection

        MySqlLeaseMgr
        - Added start***Query4/6 variants

    src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
        Added tests:
        - TEST_F(MySqlLeaseMgrTest, leaseStatsQuery4)
        - TEST_F(MySqlLeaseMgrTest, leaseStatsQuery6)
This commit is contained in:
Thomas Markwalder
2018-05-02 13:36:02 -04:00
parent 6c3c1afdec
commit a662ab45d9
12 changed files with 950 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
src/lib/dhcpsrv/mysql_lease_mgr.cc
View File

@@ -240,13 +240,37 @@ tagged_statements = { {
"hostname = ?, hwaddr = ?, hwtype = ?, hwaddr_source = ?, "
"state = ? "
"WHERE address = ?"},
{MySqlLeaseMgr::RECOUNT_LEASE4_STATS,
"SELECT subnet_id, state, count(state) as state_count "
" FROM lease4 GROUP BY subnet_id, state ORDER BY subnet_id"},
{MySqlLeaseMgr::RECOUNT_LEASE6_STATS,
"SELECT subnet_id, lease_type, state, count(state) as state_count"
" FROM lease6 GROUP BY subnet_id, lease_type, state "
" ORDER BY subnet_id" }
{MySqlLeaseMgr::ALL_LEASE4_STATS,
"SELECT subnet_id, state, leases as state_count"
" FROM lease4_stat ORDER BY subnet_id, state"},
{MySqlLeaseMgr::SUBNET_LEASE4_STATS,
"SELECT subnet_id, state, leases as state_count"
" FROM lease4_stat "
" WHERE subnet_id = ? "
" ORDER BY state"},
{MySqlLeaseMgr::SUBNET_RANGE_LEASE4_STATS,
"SELECT subnet_id, state, leases as state_count"
" FROM lease4_stat "
" WHERE subnet_id >= ? and subnet_id <= ? "
" ORDER BY subnet_id, state"},
{MySqlLeaseMgr::ALL_LEASE6_STATS,
"SELECT subnet_id, lease_type, state, leases as state_count"
" FROM lease6_stat ORDER BY subnet_id, lease_type, state" },
{MySqlLeaseMgr::SUBNET_LEASE6_STATS,
"SELECT subnet_id, lease_type, state, leases as state_count"
" FROM lease6_stat "
" WHERE subnet_id = ? "
" ORDER BY lease_type, state" },
{MySqlLeaseMgr::SUBNET_RANGE_LEASE6_STATS,
"SELECT subnet_id, lease_type, state, leases as state_count"
" FROM lease6_stat "
" WHERE subnet_id >= ? and subnet_id <= ? "
" ORDER BY subnet_id, lease_type, state" }
}
};
@@ -1262,11 +1286,14 @@ private:
///
class MySqlLeaseStatsQuery : public LeaseStatsQuery {
public:
/// @brief Constructor
/// @brief Constructor to query for all subnets' stats
///
/// The query created will return statistics for all subnets
///
/// @param conn A open connection to the database housing the lease data
/// @param statement_index Index of the query's prepared statement
/// @param fetch_type Indicates if query supplies lease type
/// @throw if statement index is invalid.
MySqlLeaseStatsQuery(MySqlConnection& conn, const size_t statement_index,
const bool fetch_type)
: conn_(conn), statement_index_(statement_index), statement_(NULL),
@@ -1275,12 +1302,51 @@ public:
// This is the number of columns expected in the result set
bind_(fetch_type_ ? 4 : 3),
subnet_id_(0), lease_type_(0), lease_state_(0), state_count_(0) {
if (statement_index_ >= MySqlLeaseMgr::NUM_STATEMENTS) {
isc_throw(BadValue, "MySqlLeaseStatsQuery"
" - invalid statement index" << statement_index_);
}
validateStatement();
}
statement_ = conn.statements_[statement_index_];
/// @brief Constructor to query for a single subnet's stats
///
/// The query created will return statistics for a single subnet
///
/// @param conn A open connection to the database housing the lease data
/// @param statement_index Index of the query's prepared statement
/// @param fetch_type Indicates if query supplies lease type
/// @param subnet_id id of the subnet for which stats are desired
/// @throw BadValue if sunbet_id given is 0 or if statement index is invalid.
MySqlLeaseStatsQuery(MySqlConnection& conn, const size_t statement_index,
const bool fetch_type, const SubnetID& subnet_id)
: LeaseStatsQuery(subnet_id), conn_(conn), statement_index_(statement_index),
statement_(NULL), fetch_type_(fetch_type),
// Set the number of columns in the bind array based on fetch_type
// This is the number of columns expected in the result set
bind_(fetch_type_ ? 4 : 3),
subnet_id_(0), lease_type_(0), lease_state_(0), state_count_(0) {
validateStatement();
}
/// @brief Constructor to query for the stats for a range of subnets
///
/// The query created will return statistics for the inclusive range of
/// subnets described by first and last sunbet IDs.
///
/// @param conn A open connection to the database housing the lease data
/// @param statement_index Index of the query's prepared statement
/// @param fetch_type Indicates if query supplies lease type
/// @param first_subnet_id first subnet in the range of subnets
/// @param last_subnet_id last subnet in the range of subnets
/// @throw BadValue if either subnet ID is 0 or if last <= first or
/// if statement index is invalid.
MySqlLeaseStatsQuery(MySqlConnection& conn, const size_t statement_index,
const bool fetch_type, const SubnetID& first_subnet_id,
const SubnetID& last_subnet_id)
: LeaseStatsQuery(first_subnet_id, last_subnet_id), conn_(conn),
statement_index_(statement_index), statement_(NULL), fetch_type_(fetch_type),
// Set the number of columns in the bind array based on fetch_type
// This is the number of columns expected in the result set
bind_(fetch_type_ ? 4 : 3),
subnet_id_(0), lease_type_(0), lease_state_(0), state_count_(0) {
validateStatement();
}
/// @brief Destructor
@@ -1296,6 +1362,28 @@ public:
/// the output bind array and then executes the statement, and fetches
/// entire result set.
void start() {
// Set up where clause inputs if needed */
if (getSelectMode() != ALL_SUBNETS) {
MYSQL_BIND inbind[2];
memset(inbind, 0, sizeof(inbind));
// Add first_subnet_id used by both single and range.
inbind[0].buffer_type = MYSQL_TYPE_LONG;
inbind[0].buffer = reinterpret_cast<char*>(&first_subnet_id_);
inbind[0].is_unsigned = MLM_TRUE;
// Add last_subnet_id for range.
if (getSelectMode() == SUBNET_RANGE) {
inbind[1].buffer_type = MYSQL_TYPE_LONG;
inbind[1].buffer = reinterpret_cast<char*>(&last_subnet_id_);
inbind[1].is_unsigned = MLM_TRUE;
}
// Bind the parameters to the statement
int status = mysql_stmt_bind_param(statement_, &inbind[0]);
conn_.checkError(status, statement_index_, "unable to bind parameters");
}
int col = 0;
// subnet_id: unsigned int
bind_[col].buffer_type = MYSQL_TYPE_LONG;
@@ -1321,7 +1409,7 @@ public:
++col;
// state_count_: uint32_t
bind_[col].buffer_type = MYSQL_TYPE_LONG;
bind_[col].buffer_type = MYSQL_TYPE_LONGLONG;
bind_[col].buffer = reinterpret_cast<char*>(&state_count_);
bind_[col].is_unsigned = MLM_TRUE;
@@ -1368,6 +1456,18 @@ public:
}
private:
/// @brief Validate the statement index passed to the constructor
/// Safely fetch the statement from the connection based on statement index
/// @throw BadValue if statement index is out of range
void validateStatement() {
if (statement_index_ >= MySqlLeaseMgr::NUM_STATEMENTS) {
isc_throw(BadValue, "MySqlLeaseStatsQuery"
" - invalid statement index" << statement_index_);
}
statement_ = conn_.statements_[statement_index_];
}
/// @brief Database connection to use to execute the query
MySqlConnection& conn_;
@@ -1390,7 +1490,7 @@ private:
/// @brief Receives the lease state when fetching a row
uint32_t lease_state_;
/// @brief Receives the state count when fetching a row
uint32_t state_count_;
int64_t state_count_;
};
// MySqlLeaseMgr Constructor and Destructor
@@ -2185,21 +2285,63 @@ MySqlLeaseMgr::deleteExpiredReclaimedLeasesCommon(const uint32_t secs,
LeaseStatsQueryPtr
MySqlLeaseMgr::startLeaseStatsQuery4() {
LeaseStatsQueryPtr query(new MySqlLeaseStatsQuery(conn_,
RECOUNT_LEASE4_STATS,
ALL_LEASE4_STATS,
false));
query->start();
return(query);
}
LeaseStatsQueryPtr
MySqlLeaseMgr::startSubnetLeaseStatsQuery4(const SubnetID& subnet_id) {
LeaseStatsQueryPtr query(new MySqlLeaseStatsQuery(conn_,
SUBNET_LEASE4_STATS,
false,
subnet_id));
query->start();
return(query);
}
LeaseStatsQueryPtr
MySqlLeaseMgr::startSubnetRangeLeaseStatsQuery4(const SubnetID& first_subnet_id,
const SubnetID& last_subnet_id) {
LeaseStatsQueryPtr query(new MySqlLeaseStatsQuery(conn_,
SUBNET_RANGE_LEASE4_STATS,
false,
first_subnet_id, last_subnet_id));
query->start();
return(query);
}
LeaseStatsQueryPtr
MySqlLeaseMgr::startLeaseStatsQuery6() {
LeaseStatsQueryPtr query(new MySqlLeaseStatsQuery(conn_,
RECOUNT_LEASE6_STATS,
ALL_LEASE6_STATS,
true));
query->start();
return(query);
}
LeaseStatsQueryPtr
MySqlLeaseMgr::startSubnetLeaseStatsQuery6(const SubnetID& subnet_id) {
LeaseStatsQueryPtr query(new MySqlLeaseStatsQuery(conn_,
SUBNET_LEASE6_STATS,
true,
subnet_id));
query->start();
return(query);
}
LeaseStatsQueryPtr
MySqlLeaseMgr::startSubnetRangeLeaseStatsQuery6(const SubnetID& first_subnet_id,
const SubnetID& last_subnet_id) {
LeaseStatsQueryPtr query(new MySqlLeaseStatsQuery(conn_,
SUBNET_RANGE_LEASE6_STATS,
true,
first_subnet_id, last_subnet_id));
query->start();
return(query);
}
size_t
MySqlLeaseMgr::wipeLeases4(const SubnetID& /*subnet_id*/) {
isc_throw(NotImplemented, "wipeLeases4 is not implemented for MySQL backend");