natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CFS should ignore non-db files 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@957293 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Dusbabek 2010-06-23 18:31:18 +00:00
parent 442c34b557
commit 6352995c8a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -19,6 +19,7 @@
package org.apache.cassandra.db;
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOError;
import java.io.IOException;
import java.lang.management.ManagementFactory;
@ -92,6 +93,14 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
new LinkedBlockingQueue<Runnable>(DatabaseDescriptor.getFlushWriters()),
new NamedThreadFactory("FLUSH-WRITER-POOL"));
private static ExecutorService commitLogUpdater_ = new JMXEnabledThreadPoolExecutor("MEMTABLE-POST-FLUSHER");
private static final FilenameFilter DB_NAME_FILTER = new FilenameFilter()
{
public boolean accept(File dir, String name)
{
return name.matches("[^\\.][\\S]+?[\\.db]");
}
};
private Set<Memtable> memtablesPendingFlush = new ConcurrentSkipListSet<Memtable>();
@ -242,7 +251,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
for (String directory : dataFileDirectories)
{
File fileDir = new File(directory);
File[] files = fileDir.listFiles();
File[] files = fileDir.listFiles(DB_NAME_FILTER);
for (File file : files)
{
@ -283,7 +292,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Set<File> fileSet = new HashSet<File>();
for (String directory : DatabaseDescriptor.getAllDataFileLocationsForTable(table_))
{
File[] files = new File(directory).listFiles();
File[] files = new File(directory).listFiles(DB_NAME_FILTER);
for (File file : files)
{
if (file.isDirectory())