[#805,!5-p] Addressed review comments

    Minor cleanup and commentary.

diff --git a/src/lib/database/dbaccess_parser.cc b/src/lib/database/dbaccess_parser.cc
index 6e7d8961b736ac336008d012f658a55d775b9282..5081f36b72420e331c041e44b76137c68ca0b171 100644 (file)
--- a/src/lib/database/dbaccess_parser.cc
+++ b/src/lib/database/dbaccess_parser.cc
@@ -182,7 +182,7 @@ DbAccessParser::parse(std::string& access_string,
 
     // f. Check that the max-row-errors is within a reasonable range.
     if ((max_row_errors < 0) ||
-        (max_row_errors > std::numeric_limits<uint16_t>::max())) {
+        (max_row_errors > std::numeric_limits<uint32_t>::max())) {
         ConstElementPtr value = database_config->get("max-row-errors");
         isc_throw(DbConfigError, "max-row-errors value: " << max_row_errors
                   << " is out of range, expected value: 0.."

diff --git a/src/lib/database/tests/database_connection_unittest.cc b/src/lib/database/tests/database_connection_unittest.cc
index c644e7e139fd6fc59146add67cf57b118399da58..68bc500998f1039912fc4fc09af3e7bc1621052a 100644 (file)
--- a/src/lib/database/tests/database_connection_unittest.cc
+++ b/src/lib/database/tests/database_connection_unittest.cc
@@ -277,7 +277,8 @@ TEST(DatabaseConnection, toElementDbAccessStringValid) {
         "\"tcp-keepalive\": 101, \n"
         "\"tcp-nodelay\": false, \n"
         "\"type\": \"memfile\", \n"
-        "\"user\": \"user_str\" \n"
+        "\"user\": \"user_str\", \n"
+        "\"max-row-errors\": 50 \n"
         "}\n"
     };
 

diff --git a/src/lib/database/tests/dbaccess_parser_unittest.cc b/src/lib/database/tests/dbaccess_parser_unittest.cc
index 6553209698d95a6b393cb3120f8a33d8c44ba05b..4894527ec8ee7148ee47339e51a86afcb3056137 100644 (file)
--- a/src/lib/database/tests/dbaccess_parser_unittest.cc
+++ b/src/lib/database/tests/dbaccess_parser_unittest.cc
@@ -507,7 +507,7 @@ TEST_F(DbAccessParserTest, negativeMaxRowErrors) {
 }
 
 // This test checks that the parser rejects a too large (greater than
-// the max uint32_t) value of the timeout parameter.
+// the max uint32_t) value of the max-row-errors parameter.
 TEST_F(DbAccessParserTest, largeMaxRowErrors) {
     const char* config[] = {"type", "memfile",
                             "name", "/opt/var/lib/kea/kea-leases6.csv",

diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index a94c048a9e2b68a7dd93f4fba70298a369b54a69..9efa6d7d5ca452b8b9c6128768e433f1b68a01ad 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -1422,7 +1422,7 @@ bool Memfile_LeaseMgr::loadLeasesFromFiles(const std::string& filename,
     try {
         max_row_errors_str = conn_.getParameter("max-row-errors");
     } catch (const std::exception&) {
-        // Ignore and default to 3600.
+        // Ignore and default to 0.
     }
 
     uint32_t max_row_errors = 0;