Commit 4e996af0 authored by Igor Zimovets (EPAM)'s avatar Igor Zimovets (EPAM)
Browse files

Merge branch 'master' into GONRG-4772-update-storage-variable

parents 1f535799 07985b22
Pipeline #105851 failed with stages
in 42 minutes and 8 seconds
......@@ -292,7 +292,7 @@ OBM connection properties of these servers (url, etc.) are defined as specific p
</td>
</tr>
<tr>
<td>&lt;PartitionInfo.projectId><strong>-records</strong>
<td>&lt;PartitionInfo.projectId-PartitionInfo.name><strong>-records</strong>
</td>
<td>ListObjects, CRUDObject
</td>
......
......@@ -96,7 +96,7 @@ These buckets must be defined in tenants’ “data” GCP projects that names a
</td>
</tr>
<tr>
<td>&lt;PartitionInfo.projectId><strong>-records</strong>
<td>&lt;PartitionInfo.projectId-PartitionInfo.name><strong>-records</strong>
</td>
<td>ListObjects, CRUDObject
</td>
......
......@@ -397,7 +397,7 @@ public class ObmStorage implements ICloudStorage {
}
private static String getBucketName(TenantInfo tenant) {
return String.format("%s-records", tenant.getProjectId());
return String.format("%s-%s-records", tenant.getProjectId(), tenant.getName());
}
private ObmDestination getDestination() {
......
......@@ -39,7 +39,6 @@ import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.model.legal.InvalidTagWithReason;
import org.opengroup.osdu.core.common.model.legal.Legal;
import org.opengroup.osdu.core.common.model.legal.LegalCompliance;
import org.opengroup.osdu.core.common.model.legal.jobs.ComplianceUpdateStoppedException;
import org.opengroup.osdu.core.common.model.storage.PubSubInfo;
import org.opengroup.osdu.core.common.model.storage.RecordMetadata;
import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
......@@ -147,7 +146,7 @@ public class MultiThreadingLegalTagChangedProcessingTest {
}
@Test
public void testSingle() throws ComplianceUpdateStoppedException, InterruptedException {
public void testMultithreadingMessageProcessingWithDifferentTenants() throws InterruptedException {
ExecutorService service = Executors.newFixedThreadPool(numberOfTenantRuns);
for (int i = 0; i < numberOfTenantRuns; i++) {
int finalI = i;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment