summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Fernandes <josferna@redhat.com>2015-05-21 11:17:59 +0530
committerVijay Bellur <vbellur@redhat.com>2015-05-27 03:58:41 -0700
commit628198deaf0bc3192607a01ccfaa7a605723fa4d (patch)
tree6e1a77aabd77b83d89dff2f98f25f06527a72452
parent3b666b40efbed157e8c5991f29b345d93b28c659 (diff)
tier/tier.t: Fixing tier.t crash in regression runs
1) If the database file exists a. Dont try re-creating the db schema b. Dont try re-configuring the db. 2) Dont assert in fini_db () when connection is NULL Change-Id: I15dd103fe7542f70113c1d5e539a99f8cd062be4 BUG: 1163543 Signed-off-by: Joseph Fernandes <josferna@redhat.com> Reviewed-on: http://review.gluster.org/10870 Tested-by: NetBSD Build System Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--libglusterfs/src/gfdb/gfdb_data_store.c14
-rw-r--r--libglusterfs/src/gfdb/gfdb_sqlite3.c11
-rwxr-xr-xrun-tests.sh1
3 files changed, 17 insertions, 9 deletions
diff --git a/libglusterfs/src/gfdb/gfdb_data_store.c b/libglusterfs/src/gfdb/gfdb_data_store.c
index ec92f7a..5699b75 100644
--- a/libglusterfs/src/gfdb/gfdb_data_store.c
+++ b/libglusterfs/src/gfdb/gfdb_data_store.c
@@ -55,6 +55,16 @@ do {\
GF_ASSERT (_conn_node->gfdb_connection.gf_db_connection);\
} while (0)
+/* Checks the sanity of the connection node and goto */
+#define CHECK_CONN_NODE_GOTO(_conn_node, label)\
+do {\
+ if (!_conn_node) {\
+ goto label;\
+ };\
+ if (!_conn_node->gfdb_connection.gf_db_connection) {\
+ goto label;\
+ };\
+} while (0)
/*Check if the conn node is first in the list*/
#define IS_FIRST_NODE(db_conn_list, _conn_node)\
@@ -297,7 +307,7 @@ fini_db (gfdb_conn_node_t *_conn_node)
int ret = -1;
gfdb_db_operations_t *db_operations_t = NULL;
- CHECK_CONN_NODE(_conn_node);
+ CHECK_CONN_NODE_GOTO (_conn_node, empty);
db_operations_t = &_conn_node->gfdb_connection.gfdb_db_operations;
@@ -316,7 +326,7 @@ fini_db (gfdb_conn_node_t *_conn_node)
gf_log (GFDB_DATA_STORE, GF_LOG_ERROR,
"Failed deleting connection node from list");
}
-
+empty:
ret = 0;
out:
return ret;
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c
index b9de3d3..02d6085 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c
@@ -436,9 +436,9 @@ gf_sqlite3_init (dict_t *args, void **db_conn) {
}
/* If the file exist we skip the config part
- * and create the schema if NOT Present*/
+ * and creation of the schema */
if (is_dbfile_exist)
- goto create_table;
+ goto db_exists;
/*Apply sqlite3 params to database*/
@@ -450,17 +450,16 @@ gf_sqlite3_init (dict_t *args, void **db_conn) {
goto out;
}
-/*Create the schema if NOT present*/
-create_table:
-
+ /*Create the schema if NOT present*/
ret = create_filetable (sql_conn->sqlite3_db_conn);
if (ret) {
gf_log (GFDB_STR_SQLITE3, GF_LOG_ERROR,
"Failed Creating %s Table", GF_FILE_TABLE);
goto out;
}
- ret = 0;
+db_exists:
+ ret = 0;
out:
if (ret) {
gf_sqlite3_fini ((void **)&sql_conn);
diff --git a/run-tests.sh b/run-tests.sh
index ccc52f3..d924332 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -197,7 +197,6 @@ function is_bad_test ()
for bt in ./tests/basic/uss.t \
./tests/bugs/replicate/bug-1015990.t \
./tests/basic/ec/quota.t \
- ./tests/basic/tier/tier.t \
./tests/basic/quota-nfs.t \
./tests/bugs/quota/bug-1035576.t \
./tests/bugs/glusterfs/bug-867253.t \