This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 0735df44c3a1a142a8e9b51c9adb8536181ccfca Author: RMT <[email protected]> AuthorDate: Wed Sep 6 21:41:14 2023 -0600 Fix resource group io limit flaky case (#16386) Fix resource group io limit flaky case. The flaky case caused by running mkdir on multi segments at the same host. Just catch FileExistsError and ignore it is ok, the mkdir function just need the dir exists. --- src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out | 2 +- src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out b/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out index 61e1e7474c2..e2e959374b2 100644 --- a/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out +++ b/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out @@ -138,7 +138,7 @@ CREATE 0: CREATE OR REPLACE FUNCTION mkdir(dirname text) RETURNS BOOL AS $$ import os if os.path.exists(dirname): return True -try: os.makedirs(dirname) except Exception as e: plpy.error("cannot create dir {}".format(e)) else: return True $$ LANGUAGE plpython3u; +try: os.makedirs(dirname) except FileExistsError: return True except Exception as e: plpy.error("cannot create dir {}".format(e)) else: return True $$ LANGUAGE plpython3u; CREATE 0: CREATE OR REPLACE FUNCTION rmdir(dirname text) RETURNS BOOL AS $$ import shutil import fcntl import os diff --git a/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql b/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql index 6a60a32e3f7..88f66c4f18d 100644 --- a/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql +++ b/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql @@ -320,6 +320,8 @@ $$ LANGUAGE plpython3u; try: os.makedirs(dirname) + except FileExistsError: + return True except Exception as e: plpy.error("cannot create dir {}".format(e)) else: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
