database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix some load bugs (#2384)

Browse Source 
For #2383 
1. Limit the concurrent transactions of routine load job
2. Create new routine load task when txn is VISIBLE, not after COMMITTED.

For #2267 
1. All non-master daemon thread should also be started after catalog is ready.

For #2354 
1. `fixLoadJobMetaError()` should be called after all meta data is read, including image and edit logs.
2. Mini load job should set to CANCELLED when corresponding transaction is not found, instead
of UNKNOWN.
This commit is contained in:
Mingyu Chen
2019-12-05 13:41:04 +08:00
committed by GitHub
parent 102a845131
commit 4f39d405ee
18 changed files with 236 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/src/test/java/org/apache/doris/http/DorisHttpTestCase.java
View File

@ -110,7 +110,7 @@ abstract public class DorisHttpTestCase {
public static final int HTTP_PORT;
static {
Random r = new Random(System.currentTimeMillis());
HTTP_PORT = 30000 + r.nextInt(10000);
HTTP_PORT = 20000 + r.nextInt(10000);
}
protected static final String URI = "http://localhost:" + HTTP_PORT + "/api/" + DB_NAME + "/" + TABLE_NAME;

14
fe/src/test/java/org/apache/doris/mysql/privilege/AuthTest.java
View File

@ -247,7 +247,7 @@ public class AuthTest {
}
// 5.1 resolve domain [palo.domain1]
resolver.runOneCycle();
resolver.runAfterCatalogReady();
// 6. check if user from resolved ip can access to palo
Assert.assertTrue(auth.checkPlainPassword(SystemInfoService.DEFAULT_CLUSTER + ":zhangsan", "10.1.1.1",
@ -296,7 +296,7 @@ public class AuthTest {
}
// 8.1 resolve domain [palo.domain2]
resolver.runOneCycle();
resolver.runAfterCatalogReady();
Assert.assertTrue(auth.checkPlainPassword(SystemInfoService.DEFAULT_CLUSTER + ":lisi", "20.1.1.1",
"123456"));
@ -470,7 +470,7 @@ public class AuthTest {
SystemInfoService.DEFAULT_CLUSTER + ":zhangsan",
PrivPredicate.ALTER));
resolver.runOneCycle();
resolver.runAfterCatalogReady();
Assert.assertTrue(auth.checkDbPriv("10.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db3",
SystemInfoService.DEFAULT_CLUSTER + ":zhangsan",
@ -502,7 +502,7 @@ public class AuthTest {
SystemInfoService.DEFAULT_CLUSTER + ":zhangsan",
PrivPredicate.SELECT));
resolver.runOneCycle();
resolver.runAfterCatalogReady();
Assert.assertTrue(auth.checkDbPriv("10.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db3",
SystemInfoService.DEFAULT_CLUSTER + ":zhangsan",
@ -714,7 +714,7 @@ public class AuthTest {
Assert.assertTrue(auth.checkDbPriv("10.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db3",
SystemInfoService.DEFAULT_CLUSTER + ":zhangsan",
PrivPredicate.DROP));
resolver.runOneCycle();
resolver.runAfterCatalogReady();
Assert.assertFalse(auth.checkDbPriv("10.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db3",
SystemInfoService.DEFAULT_CLUSTER + ":zhangsan",
PrivPredicate.DROP));
@ -851,7 +851,7 @@ public class AuthTest {
Assert.assertFalse(auth.checkDbPriv("20.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db4",
SystemInfoService.DEFAULT_CLUSTER + ":chenliu",
PrivPredicate.DROP));
resolver.runOneCycle();
resolver.runAfterCatalogReady();
Assert.assertTrue(auth.checkDbPriv("20.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db4",
SystemInfoService.DEFAULT_CLUSTER + ":chenliu",
PrivPredicate.DROP));
@ -894,7 +894,7 @@ public class AuthTest {
Assert.assertTrue(auth.checkDbPriv("20.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db4",
SystemInfoService.DEFAULT_CLUSTER + ":chenliu",
PrivPredicate.DROP));
resolver.runOneCycle();
resolver.runAfterCatalogReady();
Assert.assertFalse(auth.checkDbPriv("20.1.1.1", SystemInfoService.DEFAULT_CLUSTER + ":db4",
SystemInfoService.DEFAULT_CLUSTER + ":chenliu",
PrivPredicate.DROP));