Permalink
Browse files

Checkpoint before tests

  • Loading branch information...
jarulraj committed Apr 17, 2014
1 parent 2574afb commit 59579e6e3a97018ad70f6aecfff6de7724bd2938
View
@@ -385,13 +385,6 @@
if CTX.ARIES:
CTX.CPPFLAGS += " -DARIES"
###############################################################################
# SNAPSHOT
###############################################################################
if CTX.SNAPSHOT:
CTX.CPPFLAGS += " -DSNAPSHOT"
###############################################################################
# ANTI-CACHING
###############################################################################
View
@@ -41,12 +41,11 @@ def __init__(self, args):
self.LOG_LEVEL = "DEBUG"
self.VOLT_LOG_LEVEL = None
self.STORAGE_MMAP = False
self.ANTICACHE_BUILD = False
self.ANTICACHE_REVERSIBLE_LRU = False
self.ANTICACHE_NVM = False
self.ANTICACHE_DRAM = False
self.ARIES= False
self.SNAPSHOT= False
self.ANTICACHE_BUILD = True
self.ANTICACHE_REVERSIBLE_LRU = True
self.ANTICACHE_NVM = True
self.ANTICACHE_DRAM =True
self.ARIES= True
for arg in [x.strip().upper() for x in args]:
if arg in ["DEBUG", "RELEASE", "MEMCHECK", "MEMCHECK_NOFREELIST"]:
@@ -67,9 +66,6 @@ def __init__(self, args):
if arg.startswith("ARIES="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.ARIES = bool(parts[1])
if arg.startswith("SNAPSHOT="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.ARIES = bool(parts[1])
if arg.startswith("ANTICACHE_ENABLE="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.ANTICACHE_ENABLE = bool(parts[1])
@@ -129,7 +129,7 @@ public VoltTable startSnapshotting(String file_path, String file_nonce, byte blo
if (failures.isEmpty()) {
blockingResult.addRow(
Integer.parseInt(context.getSite().getHost().getTypeName()),
Integer.parseInt(context.getSite().getHost().getTypeName().replaceAll("[\\D]", "")),
hostname,
context.getHStoreSite().getSiteId(),
context.getPartitionExecutor().getPartitionId(),
@@ -142,7 +142,7 @@ public VoltTable startSnapshotting(String file_path, String file_nonce, byte blo
err = e.toString();
}
blockingResult.addRow(
Integer.parseInt(context.getSite().getHost().getTypeName()),
Integer.parseInt(context.getSite().getHost().getTypeName().replaceAll("[\\D]", "")),
hostname,
context.getHStoreSite().getSiteId(),
context.getPartitionExecutor().getPartitionId(),
@@ -291,7 +291,7 @@ public void run() {
"RESULTED IN IOException: \n" + sw.toString();
}
result.addRow(Integer.parseInt(context.getSite().getHost().getTypeName()),
result.addRow(Integer.parseInt(context.getSite().getHost().getTypeName().replaceAll("[\\D]", "")),
hostname,
context.getHStoreSite().getSiteId(),
context.getPartitionExecutor().getPartitionId(),
@@ -387,7 +387,7 @@ private VoltTable acquireSnapshotPermit(SystemProcedureExecutionContext context,
try {
SnapshotSiteProcessor.m_snapshotPermits.acquire();
} catch (Exception e) {
result.addRow(Integer.parseInt(context.getSite().getHost().getTypeName()),
result.addRow(Integer.parseInt(context.getSite().getHost().getTypeName().replaceAll("[\\D]", "")),
hostname,
context.getHStoreSite().getSiteId(),
context.getPartitionExecutor().getPartitionId(),
@@ -424,7 +424,7 @@ private final SnapshotDataTarget constructSnapshotDataTargetForTable(
throws IOException
{
return new DefaultSnapshotDataTarget(f,
Integer.parseInt(h.getTypeName()),
Integer.parseInt(h.getTypeName().replaceAll("[\\D]", "")),
context.getCluster().getTypeName(),
context.getDatabase().getTypeName(),
table.getTypeName(),
@@ -21,8 +21,6 @@
package org.voltdb.catalog;
import org.voltdb.sysprocs.saverestore.SnapshotUtil;
/**
* A single host participating in the cluster
*/
@@ -37,9 +35,6 @@
void setBaseValues(Catalog catalog, CatalogType parent, String path, String name) {
super.setBaseValues(catalog, parent, path, name);
// remove chars - for consumers of HostId that need it be a strictly digits only
m_typename = m_typename.replaceAll("[\\D]", "");
m_fields.put("id", m_id);
m_fields.put("ipaddr", m_ipaddr);
@@ -98,7 +98,7 @@ public void initImpl() {
List<File> relevantFiles = retrieveRelevantFiles(paths[ii], nonces[ii]);
if (relevantFiles == null) {
result.addRow(
Integer.parseInt(context.getSite().getHost().getTypeName()),
Integer.parseInt(context.getSite().getHost().getTypeName().replaceAll("[\\D]", "")),
hostname,
paths[ii],
nonces[ii],
@@ -111,8 +111,8 @@ public void initImpl() {
for (final File f : relevantFiles) {
long size = f.length();
boolean deleted = f.delete();
result.addRow(
Integer.parseInt(context.getSite().getHost().getTypeName()),
result.addRow(
Integer.parseInt(context.getSite().getHost().getTypeName().replaceAll("[\\D]", "")),
hostname,
paths[ii],
nonces[ii],
Oops, something went wrong.

0 comments on commit 59579e6

Please sign in to comment.