diff --git a/docs/en/docs/admin-manual/multi-tenant.md b/docs/en/docs/admin-manual/multi-tenant.md index 6a8e1566ae88f0..893e36a6f71029 100644 --- a/docs/en/docs/admin-manual/multi-tenant.md +++ b/docs/en/docs/admin-manual/multi-tenant.md @@ -130,6 +130,8 @@ Node resource division refers to setting tags for BE nodes in a Doris cluster, a After the setting is complete, when user1 initiates a query on the UserTable table, it will only access the data copy on the nodes in the `group_a` resource group, and the query will only use the node computing resources in the `group_a` resource group. The query of user3 can use copies and computing resources in any resource group. + > Note: By default, the user's `resource_tags.location` attribute is empty. In versions prior to 2.0.2 (inclusive), by default, users are not restricted by tags and can use any resource group. After version 2.0.3, users can only use the `default` resource group by default. + In this way, we have achieved physical resource isolation for different user queries by dividing nodes and restricting user resource usage. Furthermore, we can create different users for different business departments and restrict each user from using different resource groups. In order to avoid the use of resource interference between different business parts. For example, there is a business table in the cluster that needs to be shared by all 9 business departments, but it is hoped that resource preemption between different departments can be avoided as much as possible. Then we can create 3 copies of this table and store them in 3 resource groups. Next, we create 9 users for 9 business departments, and limit the use of one resource group for every 3 users. In this way, the degree of competition for resources is reduced from 9 to 3. On the other hand, for the isolation of online and offline tasks. We can use resource groups to achieve this. For example, we can divide nodes into two resource groups, Online and Offline. The table data is still stored in 3 copies, of which 2 copies are stored in the Online resource group, and 1 copy is stored in the Offline resource group. The Online resource group is mainly used for online data services with high concurrency and low latency. Some large queries or offline ETL operations can be executed using nodes in the Offline resource group. So as to realize the ability to provide online and offline services simultaneously in a unified cluster. diff --git a/docs/zh-CN/docs/admin-manual/multi-tenant.md b/docs/zh-CN/docs/admin-manual/multi-tenant.md index afc2488cd7e778..cf121c147e08c7 100644 --- a/docs/zh-CN/docs/admin-manual/multi-tenant.md +++ b/docs/zh-CN/docs/admin-manual/multi-tenant.md @@ -130,6 +130,8 @@ FE 不参与用户数据的处理计算等工作,因此是一个资源消耗 设置完成后,user1 在发起对 UserTable 表的查询时,只会访问 `group_a` 资源组内节点上的数据副本,并且查询仅会使用 `group_a` 资源组内的节点计算资源。而 user3 的查询可以使用任意资源组内的副本和计算资源。 + > 注:默认情况下,用户的 `resource_tags.location` 属性为空,在2.0.2(含)之前的版本中,默认情况下,用户不受 tag 的限制,可以使用任意资源组。在 2.0.3 版本之后,默认情况下,用户只能使用 `default` 资源组。 + 这样,我们通过对节点的划分,以及对用户的资源使用限制,实现了不同用户查询上的物理资源隔离。更进一步,我们可以给不同的业务部门创建不同的用户,并限制每个用户使用不同的资源组。以避免不同业务部分之间使用资源干扰。比如集群内有一张业务表需要共享给所有9个业务部门使用,但是希望能够尽量避免不同部门之间的资源抢占。则我们可以为这张表创建3个副本,分别存储在3个资源组中。接下来,我们为9个业务部门创建9个用户,每3个用户限制使用一个资源组。这样,资源的竞争程度就由9降低到了3。 另一方面,针对在线和离线任务的隔离。我们可以利用资源组的方式实现。比如我们可以将节点划分为 Online 和 Offline 两个资源组。表数据依然以3副本的方式存储,其中 2 个副本存放在 Online 资源组,1 个副本存放在 Offline 资源组。Online 资源组主要用于高并发低延迟的在线数据服务,而一些大查询或离线ETL操作,则可以使用 Offline 资源组中的节点执行。从而实现在统一集群内同时提供在线和离线服务的能力。 diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java index cf36639c0a931f..8fa28485ae5b7f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java +++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/CommonUserProperties.java @@ -110,6 +110,10 @@ public void setResourceTags(Set resourceTags) { } public Set getResourceTags() { + // If resource tags in user properties is empty, use default backend tag. + if (resourceTags.isEmpty()) { + return Sets.newHashSet(Tag.DEFAULT_BACKEND_TAG); + } return resourceTags; } diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java index 793cdf6a7dd1cb..3142d75691adde 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/UserPropertyTest.java @@ -24,8 +24,10 @@ import org.apache.doris.common.UserException; import org.apache.doris.load.DppConfig; import org.apache.doris.mysql.privilege.UserProperty; +import org.apache.doris.resource.Tag; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import mockit.Expectations; import mockit.Mocked; import org.junit.Assert; @@ -116,6 +118,7 @@ public void testUpdate() throws UserException { Assert.assertEquals(new String[]{"rule1", "rule2"}, userProperty.getSqlBlockRules()); Assert.assertEquals(2, userProperty.getCpuResourceLimit()); Assert.assertEquals(500, userProperty.getQueryTimeout()); + Assert.assertEquals(Sets.newHashSet(Tag.DEFAULT_BACKEND_TAG), userProperty.getCopiedResourceTags()); // fetch property List> rows = userProperty.fetchProperty(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java index 29aa558860ff7c..eac7b7faae941d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/ResourceTagQueryTest.java @@ -194,7 +194,7 @@ public void test() throws Exception { OlapTable tbl = (OlapTable) db.getTableNullable("tbl1"); Set userTags = Env.getCurrentEnv().getAuth().getResourceTags(Auth.ROOT_USER); - Assert.assertEquals(0, userTags.size()); + Assert.assertEquals(1, userTags.size()); // set default tag for root String setPropStr = "set property for 'root' 'resource_tags.location' = 'default';"; diff --git a/fe/fe-core/src/test/java/org/apache/doris/statistics/CacheTest.java b/fe/fe-core/src/test/java/org/apache/doris/statistics/CacheTest.java index a7582d04582ebe..cb0364682c13a7 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/statistics/CacheTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/statistics/CacheTest.java @@ -242,17 +242,21 @@ public Env getCurrentEnv() { null, null, false, null, new Date().toString(), null); } }; - StatisticsCache statisticsCache = new StatisticsCache(); - ColumnStatistic columnStatistic = statisticsCache.getColumnStatistics(1, 1, 1, "col"); - Thread.sleep(3000); - columnStatistic = statisticsCache.getColumnStatistics(1, 1, 1, "col"); - Assertions.assertEquals(1, columnStatistic.count); - Assertions.assertEquals(2, columnStatistic.ndv); - Assertions.assertEquals(3, columnStatistic.avgSizeByte); - Assertions.assertEquals(4, columnStatistic.numNulls); - Assertions.assertEquals(5, columnStatistic.dataSize); - Assertions.assertEquals(6, columnStatistic.minValue); - Assertions.assertEquals(7, columnStatistic.maxValue); + try { + StatisticsCache statisticsCache = new StatisticsCache(); + ColumnStatistic columnStatistic = statisticsCache.getColumnStatistics(1, 1, 1, "col"); + Thread.sleep(3000); + columnStatistic = statisticsCache.getColumnStatistics(1, 1, 1, "col"); + Assertions.assertEquals(1, columnStatistic.count); + Assertions.assertEquals(2, columnStatistic.ndv); + Assertions.assertEquals(3, columnStatistic.avgSizeByte); + Assertions.assertEquals(4, columnStatistic.numNulls); + Assertions.assertEquals(5, columnStatistic.dataSize); + Assertions.assertEquals(6, columnStatistic.minValue); + Assertions.assertEquals(7, columnStatistic.maxValue); + } catch (Throwable t) { + t.printStackTrace(); + } } @Test diff --git a/regression-test/suites/nereids_p0/outfile/test_outfile_expr.groovy b/regression-test/suites/nereids_p0/outfile/test_outfile_expr.groovy index 6e539ad337bdba..7ac4b1b43b25a9 100644 --- a/regression-test/suites/nereids_p0/outfile/test_outfile_expr.groovy +++ b/regression-test/suites/nereids_p0/outfile/test_outfile_expr.groovy @@ -105,7 +105,7 @@ suite("test_outfile_expr") { SELECT user_id+1, age+sex, repeat(char_col, 10) FROM ${tableName} t ORDER BY user_id INTO OUTFILE "file://${outFile}/"; """ - url = result[0][3] + def url = result[0][3] urlHost = url.substring(8, url.indexOf("${outFile}")) def filePrifix = url.split("${outFile}")[1] csvFiles = "${outFile}${filePrifix}*.csv"