Skip to content
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

Jump to bottom

Fix flaky datanode_bootstrap test #4441

Merged
merged 1 commit into from Jun 21, 2022
Merged

Fix flaky datanode_bootstrap test #4441

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions tsl/src/data_node.c
View file
Open in desktop
Expand Up @@ -109,6 +109,9 @@ get_database_info(Oid dbid, DbInfo *database)
database->chartype = TextDatumGetCString(datum);
#endif

database->collation = pstrdup(database->collation);
database->chartype = pstrdup(database->chartype);

ReleaseSysCache(dbtuple);
return true;
}
Expand Down
18 changes: 6 additions & 12 deletions tsl/test/expected/data_node_bootstrap.out
View file
Open in desktop
Expand Up @@ -23,12 +23,9 @@ SELECT * FROM add_data_node('bootstrap_test', host => 'localhost', database => '
-- Ensure database and extensions are installed and have the correct
-- encoding, ctype and collation.
\c bootstrap_test :ROLE_CLUSTER_SUPERUSER;
SELECT extname, nspname
FROM pg_extension e, pg_namespace n
WHERE e.extnamespace = n.oid
AND e.extname = 'timescaledb';
extname | nspname
-------------+---------
SELECT extname, extnamespace::regnamespace FROM pg_extension e WHERE extname = 'timescaledb';
extname | extnamespace
-------------+--------------
timescaledb | public
(1 row)

Expand Down Expand Up @@ -57,12 +54,9 @@ SELECT * FROM show_data_nodes();
(0 rows)

\c bootstrap_test :ROLE_CLUSTER_SUPERUSER;
SELECT extname, nspname
FROM pg_extension e, pg_namespace n
WHERE e.extnamespace = n.oid
AND e.extname = 'timescaledb';
extname | nspname
-------------+---------
SELECT extname, extnamespace::regnamespace FROM pg_extension e WHERE extname = 'timescaledb';
extname | extnamespace
-------------+--------------
timescaledb | public
(1 row)

Expand Down
10 changes: 2 additions & 8 deletions tsl/test/sql/data_node_bootstrap.sql
View file
Open in desktop
Expand Up @@ -23,10 +23,7 @@ SELECT * FROM add_data_node('bootstrap_test', host => 'localhost', database => '
-- Ensure database and extensions are installed and have the correct
-- encoding, ctype and collation.
\c bootstrap_test :ROLE_CLUSTER_SUPERUSER;
SELECT extname, nspname
FROM pg_extension e, pg_namespace n
WHERE e.extnamespace = n.oid
AND e.extname = 'timescaledb';
SELECT extname, extnamespace::regnamespace FROM pg_extension e WHERE extname = 'timescaledb';
SELECT PG_ENCODING_TO_CHAR(encoding) = :enc
, datcollate = :coll
, datctype = :ctype
Expand All @@ -41,10 +38,7 @@ SELECT * FROM show_data_nodes();

\c bootstrap_test :ROLE_CLUSTER_SUPERUSER;

SELECT extname, nspname
FROM pg_extension e, pg_namespace n
WHERE e.extnamespace = n.oid
AND e.extname = 'timescaledb';
SELECT extname, extnamespace::regnamespace FROM pg_extension e WHERE extname = 'timescaledb';

\c :TEST_DBNAME :ROLE_CLUSTER_SUPERUSER;
\set ON_ERROR_STOP 0
Expand Down