>From Murtadha Hubail <[email protected]>:
Murtadha Hubail has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10723 )
Change subject: [NO ISSUE][OTH] Update storage options names
......................................................................
[NO ISSUE][OTH] Update storage options names
- user model changes: yes
- storage format changes: no
- interface changes: no
Details:
- Update storage options names and descriptions to better
reflect their usage.
Change-Id: I436c6327fb6b6af432e5cf74962beca38660b9c9
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java
2 files changed, 26 insertions(+), 26 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/23/10723/1
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 a9a3a3e..9aa433f 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
@@ -209,15 +209,15 @@
}
localResourceRepository.deleteStorageData();
}
- int maxConcurrentFlushes = storageProperties.getMaxConcurrentFlushes();
- if (maxConcurrentFlushes <= 0) {
- maxConcurrentFlushes = ioManager.getIODevices().size();
+ int maxScheduledFlushes = storageProperties.getMaxScheduledFlushes();
+ if (maxScheduledFlushes <= 0) {
+ maxScheduledFlushes = ioManager.getIODevices().size();
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("The value of maxConcurrentFlushes is not
provided. Setting maxConcurrentFlushes = {}.",
- maxConcurrentFlushes);
+ LOGGER.info("The value of maxScheduledFlushes is not provided.
Setting maxConcurrentFlushes = {}.",
+ maxScheduledFlushes);
}
}
- virtualBufferCache = new GlobalVirtualBufferCache(allocator,
storageProperties, maxConcurrentFlushes);
+ virtualBufferCache = new GlobalVirtualBufferCache(allocator,
storageProperties, maxScheduledFlushes);
// Must start vbc now instead of by life cycle component manager
(lccm) because lccm happens after
// the metadata bootstrap task
((ILifeCycleComponent) virtualBufferCache).start();
@@ -584,24 +584,24 @@
String schedulerName = storageProperties.getIoScheduler();
int numPartitions = ioManager.getIODevices().size();
- int maxRunningFlushes =
storageProperties.getMaxRunningFlushes(numPartitions);
+ int maxConcurrentFlushes =
storageProperties.geMaxConcurrentFlushes(numPartitions);
int maxScheduledMerges =
storageProperties.getMaxScheduledMerges(numPartitions);
- int maxRunningMerges =
storageProperties.getMaxRunningMerges(numPartitions);
+ int maxConcurrentMerges =
storageProperties.getMaxConcurrentMerges(numPartitions);
ILSMIOOperationScheduler ioScheduler = null;
if
(AsynchronousScheduler.FACTORY.getName().equalsIgnoreCase(schedulerName)) {
ioScheduler =
AsynchronousScheduler.FACTORY.createIoScheduler(getServiceContext().getThreadFactory(),
- HaltCallback.INSTANCE, maxRunningFlushes,
maxScheduledMerges, maxRunningMerges);
+ HaltCallback.INSTANCE, maxConcurrentFlushes,
maxScheduledMerges, maxConcurrentMerges);
} else if
(GreedyScheduler.FACTORY.getName().equalsIgnoreCase(schedulerName)) {
ioScheduler =
GreedyScheduler.FACTORY.createIoScheduler(getServiceContext().getThreadFactory(),
- HaltCallback.INSTANCE, maxRunningFlushes,
maxScheduledMerges, maxRunningMerges);
+ HaltCallback.INSTANCE, maxConcurrentFlushes,
maxScheduledMerges, maxConcurrentMerges);
} else {
if (LOGGER.isWarnEnabled()) {
LOGGER.log(Level.WARN,
"Unknown storage I/O scheduler: " + schedulerName + ";
defaulting to greedy I/O scheduler.");
}
ioScheduler =
GreedyScheduler.FACTORY.createIoScheduler(getServiceContext().getThreadFactory(),
- HaltCallback.INSTANCE, maxRunningFlushes,
maxScheduledMerges, maxRunningMerges);
+ HaltCallback.INSTANCE, maxConcurrentFlushes,
maxScheduledMerges, maxConcurrentMerges);
}
return ioScheduler;
}
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java
index fc33b1a..ed75e00 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/StorageProperties.java
@@ -49,16 +49,16 @@
STORAGE_MEMORYCOMPONENT_PAGESIZE(INTEGER_BYTE_UNIT,
StorageUtil.getIntSizeInBytes(128, KILOBYTE)),
STORAGE_MEMORYCOMPONENT_NUMCOMPONENTS(POSITIVE_INTEGER, 2),
STORAGE_MEMORYCOMPONENT_FLUSH_THRESHOLD(DOUBLE, 0.9d),
- STORAGE_MEMORYCOMPONENT_MAX_CONCURRENT_FLUSHES(INTEGER, 0),
+ STORAGE_MEMORYCOMPONENT_MAX_SCHEDULED_FLUSHES(INTEGER, 0),
STORAGE_FILTERED_MEMORYCOMPONENT_MAX_SIZE(LONG_BYTE_UNIT, 0L),
STORAGE_LSM_BLOOMFILTER_FALSEPOSITIVERATE(DOUBLE, 0.01d),
STORAGE_COMPRESSION_BLOCK(STRING, "snappy"),
STORAGE_DISK_FORCE_BYTES(LONG_BYTE_UNIT,
StorageUtil.getLongSizeInBytes(16, MEGABYTE)),
STORAGE_IO_SCHEDULER(STRING, "greedy"),
STORAGE_WRITE_RATE_LIMIT(LONG_BYTE_UNIT, 0l),
- STORAGE_MAX_RUNNING_FLUSHES_PER_PARTITION(NONNEGATIVE_INTEGER, 2),
+ STORAGE_MAX_CONCURRENT_FLUSHES_PER_PARTITION(NONNEGATIVE_INTEGER, 2),
STORAGE_MAX_SCHEDULED_MERGES_PER_PARTITION(NONNEGATIVE_INTEGER, 8),
- STORAGE_MAX_RUNNING_MERGES_PER_PARTITION(NONNEGATIVE_INTEGER, 2);
+ STORAGE_MAX_CONCURRENT_MERGES_PER_PARTITION(NONNEGATIVE_INTEGER, 2);
private final IOptionType interpreter;
private final Object defaultValue;
@@ -96,8 +96,8 @@
return "The page size in bytes for pages allocated to
memory components";
case STORAGE_MEMORYCOMPONENT_NUMCOMPONENTS:
return "The number of memory components to be used per lsm
index";
- case STORAGE_MEMORYCOMPONENT_MAX_CONCURRENT_FLUSHES:
- return "The maximum number of concurrent flush operations.
0 means that the value will be "
+ case STORAGE_MEMORYCOMPONENT_MAX_SCHEDULED_FLUSHES:
+ return "The maximum number of scheduled flush operations.
0 means that the value will be "
+ "calculated as the number of partitions";
case STORAGE_MEMORYCOMPONENT_FLUSH_THRESHOLD:
return "The memory usage threshold when memory components
should be flushed";
@@ -114,12 +114,12 @@
return "The number of bytes before each disk force
(fsync)";
case STORAGE_IO_SCHEDULER:
return "The I/O scheduler for LSM flush and merge
operations";
- case STORAGE_MAX_RUNNING_FLUSHES_PER_PARTITION:
- return "The maximum number of running flushes per
partition (0 means unlimited)";
+ case STORAGE_MAX_CONCURRENT_FLUSHES_PER_PARTITION:
+ return "The maximum number of concurrently executed
flushes per partition (0 means unlimited)";
case STORAGE_MAX_SCHEDULED_MERGES_PER_PARTITION:
return "The maximum number of scheduled merges per
partition (0 means unlimited)";
- case STORAGE_MAX_RUNNING_MERGES_PER_PARTITION:
- return "The maximum number of running merges per partition
(0 means unlimited)";
+ case STORAGE_MAX_CONCURRENT_MERGES_PER_PARTITION:
+ return "The maximum number of concurrently executed merges
per partition (0 means unlimited)";
default:
throw new IllegalStateException("NYI: " + this);
}
@@ -189,8 +189,8 @@
return (int) (getBufferCacheSize() / (getBufferCachePageSize() +
IBufferCache.RESERVED_HEADER_BYTES));
}
- public int getMaxConcurrentFlushes() {
- return
accessor.getInt(Option.STORAGE_MEMORYCOMPONENT_MAX_CONCURRENT_FLUSHES);
+ public int getMaxScheduledFlushes() {
+ return
accessor.getInt(Option.STORAGE_MEMORYCOMPONENT_MAX_SCHEDULED_FLUSHES);
}
public long getJobExecutionMemoryBudget() {
@@ -213,8 +213,8 @@
return accessor.getString(Option.STORAGE_IO_SCHEDULER);
}
- public int getMaxRunningFlushes(int numPartitions) {
- int value =
accessor.getInt(Option.STORAGE_MAX_RUNNING_FLUSHES_PER_PARTITION);
+ public int geMaxConcurrentFlushes(int numPartitions) {
+ int value =
accessor.getInt(Option.STORAGE_MAX_CONCURRENT_FLUSHES_PER_PARTITION);
return value != 0 ? value * numPartitions : Integer.MAX_VALUE;
}
@@ -223,8 +223,8 @@
return value != 0 ? value * numPartitions : Integer.MAX_VALUE;
}
- public int getMaxRunningMerges(int numPartitions) {
- int value =
accessor.getInt(Option.STORAGE_MAX_RUNNING_MERGES_PER_PARTITION);
+ public int getMaxConcurrentMerges(int numPartitions) {
+ int value =
accessor.getInt(Option.STORAGE_MAX_CONCURRENT_MERGES_PER_PARTITION);
return value != 0 ? value * numPartitions : Integer.MAX_VALUE;
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10723
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: cheshire-cat
Gerrit-Change-Id: I436c6327fb6b6af432e5cf74962beca38660b9c9
Gerrit-Change-Number: 10723
Gerrit-PatchSet: 1
Gerrit-Owner: Murtadha Hubail <[email protected]>
Gerrit-MessageType: newchange
