>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: Id5bc38ec8fd856550f118668e17e73b9420fdf5a
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
M
asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/messaging/PartitionResourcesListTask.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
4 files changed, 18 insertions(+), 27 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
Jenkins: Verified
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
index 8f6886c..18e24ab 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
@@ -24,12 +24,8 @@
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import java.util.Collection;
-<<<<<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
import java.util.HashMap;
import java.util.Map;
-=======
-import java.util.OptionalInt;
->>>>>>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -185,15 +181,11 @@
private final ICacheManager cacheManager;
private IConfigValidator configValidator;
private IDiskWriteRateLimiterProvider diskWriteRateLimiterProvider;
-<<<<<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
private final CloudProperties cloudProperties;
private IPartitionBootstrapper partitionBootstrapper;
private final INamespacePathResolver namespacePathResolver;
private final INamespaceResolver namespaceResolver;
private IDiskCacheMonitoringService diskCacheService;
-=======
- private Integer metadataPartitionId;
->>>>>>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
public NCAppRuntimeContext(INCServiceContext ncServiceContext,
NCExtensionManager extensionManager,
IPropertiesFactory propertiesFactory, INamespaceResolver
namespaceResolver,
@@ -535,17 +527,10 @@
@Override
public void initializeMetadata(boolean newUniverse, int partitionId)
throws Exception {
-<<<<<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
LOGGER.info("Bootstrapping ({}) metadata in partition {}", newUniverse
? "new" : "existing", partitionId);
MetadataNode.INSTANCE.initialize(this,
ncExtensionManager.getMetadataIndexesProvider(),
ncExtensionManager.getMetadataTupleTranslatorProvider(),
ncExtensionManager.getMetadataExtensions(),
partitionId);
-=======
- LOGGER.info("Bootstrapping metadata");
- metadataPartitionId = partitionId;
- MetadataNode.INSTANCE.initialize(this,
ncExtensionManager.getMetadataTupleTranslatorProvider(),
- ncExtensionManager.getMetadataExtensions(), partitionId);
->>>>>>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
// This is a special case, we just give the metadataNode directly.
// This way we can delay the registration of the metadataNode until
@@ -740,7 +725,6 @@
}
@Override
-<<<<<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
public IDiskCacheMonitoringService getDiskCacheService() {
return diskCacheService;
}
@@ -763,9 +747,5 @@
private int getResourceIdBlockSize() {
return isCloudDeployment() ?
storageProperties.getStoragePartitionsCount()
: ncServiceContext.getIoManager().getIODevices().size();
-=======
- public OptionalInt getMetadataPartitionId() {
- return metadataPartitionId == null ? OptionalInt.empty() :
OptionalInt.of(metadataPartitionId);
->>>>>>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
}
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
index ac4ee6f8..888cea1 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.rmi.RemoteException;
-import java.util.OptionalInt;
import java.util.concurrent.Executor;
import org.apache.asterix.common.cloud.IPartitionBootstrapper;
@@ -155,12 +154,8 @@
*/
IDiskWriteRateLimiterProvider getDiskWriteRateLimiterProvider();
-<<<<<<< HEAD (079f11 [NO ISSUE][*DB][STO] Introduce ICloudGuardian, for
validatin)
/**
* @return disk cache service
*/
IDiskCacheMonitoringService getDiskCacheService();
-=======
- OptionalInt getMetadataPartitionId();
->>>>>>> BRANCH (531f76 Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
diff --git
a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/messaging/PartitionResourcesListTask.java
b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/messaging/PartitionResourcesListTask.java
index 97d03e6..0856969 100644
---
a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/messaging/PartitionResourcesListTask.java
+++
b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/messaging/PartitionResourcesListTask.java
@@ -18,6 +18,8 @@
*/
package org.apache.asterix.replication.messaging;
+import static
org.apache.asterix.common.utils.StorageConstants.METADATA_PARTITION;
+
import java.io.DataInput;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -51,8 +53,7 @@
@Override
public void perform(INcApplicationContext appCtx, IReplicationWorker
worker) throws HyracksDataException {
LOGGER.debug("processing {}", this);
- if (appCtx.getMetadataPartitionId().isPresent() &&
appCtx.getMetadataPartitionId().getAsInt() == partition
- &&
appCtx.getReplicaManager().getPartitions().contains(partition)) {
+ if (METADATA_PARTITION == partition &&
appCtx.getReplicaManager().getPartitions().contains(partition)) {
LOGGER.warn("received request to get metadata files from
non-master {}", worker.getRemoteAddress());
throw new IllegalStateException();
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18300
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Id5bc38ec8fd856550f118668e17e73b9420fdf5a
Gerrit-Change-Number: 18300
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
