Revert "Add judgement for fault injector. (#288)" (#291)

This reverts commit a9dfe96.

Revert "Add an option to control whether compile with fault injector. (#287)"

This reverts commit a331fd9.

Co-authored-by: Hao Zhang <hzhang2@vmware.com>

Author: higuoxing

CMakeLists.txt

@@ -168,13 +168,6 @@ BuildInfo_Create(${build_info_PATH}
   CMAKE_BUILD_TYPE)
 # Create build-info end
 
-if(NOT DEFINED ENABLE_FAULT_INJECTOR)
-  set(ENABLE_FAULT_INJECTOR OFF)
-endif()
-if(ENABLE_FAULT_INJECTOR)
-  add_definitions(-DDISKQUOTA_FAULT_INJECTOR)
-endif()
-
 # Add installcheck targets
 add_subdirectory(tests)
 if(NOT DEFINED ENABLE_UPGRADE_TEST)

cmake/Distro.cmake

@@ -15,7 +15,7 @@ if(NOT DISTRO_NAME)
         string(REGEX MATCH "CentOS Linux release 7.*" matched7 "${rh_release}")
         string(REGEX MATCH "Red Hat Enterprise Linux release 8.*" matched_rhel8 "${rh_release}")
         string(REGEX MATCH "CentOS Linux release 8.*" matched_centos8 "${rh_release}")
-        string(REGEX MATCH "Rocky Linux release 8.*" matched_rocky8 "${rh_release}")
+	string(REGEX MATCH "Rocky Linux release 8.*" matched_rocky8 "${rh_release}")
         if (matched6)
             set(DISTRO_NAME rhel6)
         elseif(matched7)

diskquota.c

@@ -484,9 +484,8 @@ disk_quota_worker_main(Datum main_arg)
 	while (!got_sigterm)
 	{
 		int rc;
-#ifdef DISKQUOTA_FAULT_INJECTOR
+
 		SIMPLE_FAULT_INJECTOR("diskquota_worker_main");
-#endif
 		if (!diskquota_is_paused())
 		{
 			/* Refresh quota model with init mode */

diskquota_utility.c

@@ -1358,9 +1358,7 @@ relation_file_stat(int segno, void *ctx)
 	else
 		snprintf(file_path, MAXPGPATH, "%s.%u", stat_ctx->relation_path, segno);
 	struct stat fst;
-#ifdef DISKQUOTA_FAULT_INJECTOR
 	SIMPLE_FAULT_INJECTOR("diskquota_before_stat_relfilenode");
-#endif
 	if (stat(file_path, &fst) < 0)
 	{
 		if (errno != ENOENT)

gp_activetable.c

@@ -142,9 +142,8 @@ static void
 active_table_hook_smgrcreate(RelFileNodeBackend rnode)
 {
 	if (prev_file_create_hook) (*prev_file_create_hook)(rnode);
-#ifdef DISKQUOTA_FAULT_INJECTOR
+
 	SIMPLE_FAULT_INJECTOR("diskquota_after_smgrcreate");
-#endif
 	report_active_table_helper(&rnode);
 }
 
@@ -220,9 +219,7 @@ object_access_hook_QuotaStmt(ObjectAccessType access, Oid classId, Oid objectId,
 			report_relation_cache_helper(objectId);
 			break;
 		case OAT_POST_ALTER:
-#ifdef DISKQUOTA_FAULT_INJECTOR
 			SIMPLE_FAULT_INJECTOR("object_access_post_alter");
-#endif
 			report_altered_reloid(objectId);
 			break;
 		default:

quotamodel.c

@@ -1576,9 +1576,9 @@ check_rejectmap_by_relfilenode(RelFileNode relfilenode)
 	bool                  found;
 	RejectMapEntry        keyitem;
 	GlobalRejectMapEntry *entry;
-#ifdef DISKQUOTA_FAULT_INJECTOR
+
 	SIMPLE_FAULT_INJECTOR("check_rejectmap_by_relfilenode");
-#endif
+
 	memset(&keyitem, 0, sizeof(keyitem));
 	memcpy(&keyitem.relfilenode, &relfilenode, sizeof(RelFileNode));
 
@@ -1683,10 +1683,8 @@ quota_check_common(Oid reloid, RelFileNode *relfilenode)
 
 	enable_hardlimit = diskquota_hardlimit;
 
-#ifdef DISKQUOTA_FAULT_INJECTOR
 #ifdef FAULT_INJECTOR
 	if (SIMPLE_FAULT_INJECTOR("enable_check_quota_by_relfilenode") == FaultInjectorTypeSkip) enable_hardlimit = true;
-#endif
 #endif
 	if (relfilenode && enable_hardlimit) return check_rejectmap_by_relfilenode(*relfilenode);
 

tests/CMakeLists.txt

@@ -40,14 +40,9 @@ add_custom_target(install_test_extension
   )
 
 add_custom_target(installcheck)
+add_dependencies(isolation2 install_test_extension)
 add_dependencies(regress install_test_extension)
-
-if(ENABLE_FAULT_INJECTOR)
-  add_dependencies(isolation2 install_test_extension)
-  add_dependencies(installcheck isolation2 regress)
-else()
-  add_dependencies(installcheck regress)
-endif()
+add_dependencies(installcheck isolation2 regress)
 
 # Example to run test_truncate infinite times
 # RegressTarget_Add(regress_config