Disable C-replica in shared-storage mode

This commit is contained in:
LeonChaoHi 2024-10-21 05:46:47 +00:00 committed by ob-robot
parent acf96e359c
commit 9dd47e1144
3 changed files with 12 additions and 2 deletions

View File

@ -236,6 +236,9 @@ int ObAdminDRTaskUtil::execute_task_for_add_command_(
|| OB_UNLIKELY(!command_arg.is_add_task())) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret), K(arg), K(command_arg));
} else if (GCTX.is_shared_storage_mode() && REPLICA_TYPE_COLUMNSTORE == arg.dst_.get_replica_type()) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("C-replica not supported in shared-storage mode", KR(ret));
} else if (GCTX.self_addr() == arg.dst_.get_server()) {
// do not need to send rpc, execute locally
MTL_SWITCH(arg.tenant_id_) {

View File

@ -3439,8 +3439,6 @@ int ObDDLService::check_locality_compatible_(
} else if (OB_FAIL(ObShareUtil::check_compat_version_for_columnstore_replica(
tenant_id, is_compatible_with_columnstore_replica))) {
LOG_WARN("fail to check compatible with columnstore replica", KR(ret), K(schema));
} else if (is_compatible_with_readonly_replica && is_compatible_with_columnstore_replica) {
// check pass
} else if (OB_FAIL(schema.get_zone_replica_attr_array(zone_locality))) {
LOG_WARN("fail to get locality from schema", K(ret), K(schema));
} else {
@ -3459,6 +3457,11 @@ int ObDDLService::check_locality_compatible_(
ret = OB_NOT_SUPPORTED;
LOG_WARN("can not create tenant with column-store replica below data version 4.3.3", KR(ret));
LOG_USER_ERROR(OB_NOT_SUPPORTED, "Create tenant with C-replica in locality below data version 4.3.3");
} else if (GCTX.is_shared_storage_mode()
&& 0 != this_set.get_columnstore_replica_num()) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("can not create tenant with column-store replica in shared-storage mode", KR(ret));
LOG_USER_ERROR(OB_NOT_SUPPORTED, "In shared-storage mode, C-replica is");
}
}
}

View File

@ -176,6 +176,10 @@ int ObAlterSystemResolverUtil::check_compatibility_for_replica_type(const ObRepl
ret = OB_NOT_SUPPORTED;
LOG_WARN("data_version lower than 4.3.3, C-replica not supported");
LOG_USER_ERROR(OB_NOT_SUPPORTED, "data_version is lower than 4.3.3, C-replica");
} else if (GCTX.is_shared_storage_mode()) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("column-store replica not supported in shared-storage mode", KR(ret));
LOG_USER_ERROR(OB_NOT_SUPPORTED, "In shared-storage mode, C-replica is");
}
}
return ret;