[MultiDB]: throwing exception when database_config.json doesn't exist #319

dzhangalibaba · 2019-12-03T01:05:46Z

throwing exception if config file is missing
using interface .at() to get map entry

Signed-off-by: Dong Zhang d.zhang@alibaba-inc.com

… and using at() to get map entry

dzhangalibaba · 2019-12-03T01:21:22Z

@kcudnik @qiluo The exception part.

@qiluo-msft BTW , we need to make a agreement on whether adding db config file into build docker by default to make progress on next step. Kamil and I thought it is OK.

qiluo-msft · 2019-12-03T01:34:49Z

common/dbconnector.cpp

@@ -53,42 +53,44 @@ void SonicDBConfig::initialize(const string &file)
        {
            throw runtime_error("Sonic database config file syntax error >> " + string(e.what()));
        }
+    } else {


} else { [](start = 4, length = 8)

follow code format nearby #Closed

qiluo-msft · 2019-12-03T01:36:28Z

common/dbconnector.cpp

@@ -53,42 +53,44 @@ void SonicDBConfig::initialize(const string &file)
        {
            throw runtime_error("Sonic database config file syntax error >> " + string(e.what()));
        }
+    } else {
+        throw runtime_error("Sonic database config file doesn't exist at " + file);
    }
 }

 string SonicDBConfig::getDbInst(const string &dbName)


getDbInst [](start = 22, length = 9)

Add a unit test case for non existing dbName #Closed

DONE. Added all five API test cases.

qiluo-msft · 2019-12-03T01:36:35Z

common/dbconnector.cpp

    }
 }

 string SonicDBConfig::getDbInst(const string &dbName)
 {
    if (!m_init)
        initialize();
-    return m_db_info[dbName].first;
+    return m_db_info.at(dbName).first;
 }

 int SonicDBConfig::getDbId(const string &dbName)


getDbId [](start = 19, length = 7)

Add a unit test case for non existing dbName #Closed

DONE. Added all five API test cases.

qiluo-msft

As comments

kcudnik · 2019-12-03T14:23:32Z

for each throw can you also add swss_log_error message to make mark in syslog if on someplace someone will forget to catch/log catched exception?

dzhangalibaba · 2019-12-04T08:02:29Z

Capture Logs When exception Thrown

Dec  4 08:08:55.621594 ASW-7005 DEBUG syncd#syncd: :> syncd_main: enter
Dec  4 08:08:55.621837 ASW-7005 ERR syncd#syncd: :- initialize: Sonic database config file doesn't exist at /var/run/redis/sonic-db/database_config.json
Dec  4 08:08:55.623204 ASW-7005 INFO syncd#supervisord: syncd terminate called after throwing an instance of 'std::runtime_error'#015
Dec  4 08:08:55.623289 ASW-7005 INFO syncd#supervisord: syncd   what():  Sonic database config file doesn't exist at /var/run/redis/sonic-db/database_config.json#015

UT tests:

[ RUN      ] DBConnector.multi_db_test
Default : isInit = 0
INIT: loading nonexist db config file
INIT : load local db config file, isInit = 1
INIT: loading local config file again
GET: invalid dbname input for getDbInst()
GET: invalid dbname input for getDbId()
GET: invalid dbname input for getDbSock()
GET: invalid dbname input for getDbHostname()
GET: invalid dbname input for getDbPort()
testing APPL_DB
redis#0#/var/run/redis/redis.sock#127.0.0.1#6379
testing ASIC_DB
redis1#1#/var/run/redis/redis1.sock#127.0.0.1#6380
testing CONFIG_DB
redis2#4#/var/run/redis/redis2.sock#127.0.0.1#6381
testing COUNTERS_DB
redis1#2#/var/run/redis/redis1.sock#127.0.0.1#6380
testing FLEX_COUNTER_DB
redis3#5#/var/run/redis/redis3.sock#127.0.0.1#6382
testing LOGLEVEL_DB
redis2#3#/var/run/redis/redis2.sock#127.0.0.1#6381
testing PFC_WD_DB
redis3#5#/var/run/redis/redis3.sock#127.0.0.1#6382
testing SNMP_OVERLAY_DB
redis4#7#/var/run/redis/redis4.sock#127.0.0.1#6383
testing STATE_DB
redis4#6#/var/run/redis/redis4.sock#127.0.0.1#6383
[       OK ] DBConnector.multi_db_test (1 ms)

dzhangalibaba · 2019-12-04T08:02:44Z

for each throw can you also add swss_log_error message to make mark in syslog if on someplace someone will forget to catch/log catched exception?

Yes. Added.

qiluo-msft · 2019-12-04T20:08:56Z

tests/redis_multi_db_ut.cpp

+    EXPECT_FALSE(SonicDBConfig::isInit());
+
+
+    // load nonesist config file, should throw exception with file NO exist


nonesist [](start = 12, length = 8)

nonexisting_file #Closed

qiluo-msft

Minor issue.

dzhangalibaba · 2019-12-04T21:54:16Z

Minor issue.

FIXED

…#319) * [MultiDB]: throwing exception when database_config.json doesn't exist and using at() to get map entry * update file name * address code format * add UT and logs * fix typo

dzhangalibaba added 2 commits December 2, 2019 17:01

[MultiDB]: throwing exception when database_config.json doesn't exist…

9993672

… and using at() to get map entry

update file name

727a538

qiluo-msft reviewed Dec 3, 2019

View reviewed changes

address code format

cf3fac9

qiluo-msft reviewed Dec 3, 2019

View reviewed changes

qiluo-msft requested changes Dec 3, 2019

View reviewed changes

qiluo-msft requested a review from kcudnik December 3, 2019 01:47

add UT and logs

5c18e59

kcudnik approved these changes Dec 4, 2019

View reviewed changes

qiluo-msft reviewed Dec 4, 2019

View reviewed changes

dzhangalibaba added 2 commits December 4, 2019 13:34

fix typo

cc58463

fix typo

1579a18

qiluo-msft approved these changes Dec 4, 2019

View reviewed changes

qiluo-msft merged commit eb01b68 into sonic-net:master Dec 4, 2019

dzhangalibaba deleted the p2_error branch December 4, 2019 22:21

ishidawataru mentioned this pull request Dec 4, 2019

make database config optional #322

Open

lguohan added the Request for 201911 Branch label Dec 27, 2019

abdosi added the Included in 201911 Branch label Jan 7, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[MultiDB]: throwing exception when database_config.json doesn't exist #319

[MultiDB]: throwing exception when database_config.json doesn't exist #319

dzhangalibaba commented Dec 3, 2019

dzhangalibaba commented Dec 3, 2019

qiluo-msft Dec 3, 2019 •

edited

Loading

dzhangalibaba Dec 4, 2019

qiluo-msft Dec 3, 2019 •

edited

Loading

dzhangalibaba Dec 4, 2019

qiluo-msft Dec 3, 2019 •

edited

Loading

dzhangalibaba Dec 4, 2019

qiluo-msft left a comment

kcudnik commented Dec 3, 2019

dzhangalibaba commented Dec 4, 2019

dzhangalibaba commented Dec 4, 2019

qiluo-msft Dec 4, 2019 •

edited

Loading

dzhangalibaba Dec 4, 2019

qiluo-msft left a comment

dzhangalibaba commented Dec 4, 2019

		EXPECT_FALSE(SonicDBConfig::isInit());


		// load nonesist config file, should throw exception with file NO exist

[MultiDB]: throwing exception when database_config.json doesn't exist #319

[MultiDB]: throwing exception when database_config.json doesn't exist #319

Conversation

dzhangalibaba commented Dec 3, 2019

dzhangalibaba commented Dec 3, 2019

qiluo-msft Dec 3, 2019 • edited Loading

Choose a reason for hiding this comment

dzhangalibaba Dec 4, 2019

Choose a reason for hiding this comment

qiluo-msft Dec 3, 2019 • edited Loading

Choose a reason for hiding this comment

dzhangalibaba Dec 4, 2019

Choose a reason for hiding this comment

qiluo-msft Dec 3, 2019 • edited Loading

Choose a reason for hiding this comment

dzhangalibaba Dec 4, 2019

Choose a reason for hiding this comment

qiluo-msft left a comment

Choose a reason for hiding this comment

kcudnik commented Dec 3, 2019

dzhangalibaba commented Dec 4, 2019

dzhangalibaba commented Dec 4, 2019

qiluo-msft Dec 4, 2019 • edited Loading

Choose a reason for hiding this comment

dzhangalibaba Dec 4, 2019

Choose a reason for hiding this comment

qiluo-msft left a comment

Choose a reason for hiding this comment

dzhangalibaba commented Dec 4, 2019

qiluo-msft Dec 3, 2019 •

edited

Loading

qiluo-msft Dec 3, 2019 •

edited

Loading

qiluo-msft Dec 3, 2019 •

edited

Loading

qiluo-msft Dec 4, 2019 •

edited

Loading