You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2011/09/09 01:58:27 UTC
svn commit: r1166944 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt
src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
src/test/org/apache/hadoop/hdfs/server/datanode/TestDataBlockScanner.java
Author: jitendra
Date: Thu Sep 8 23:58:27 2011
New Revision: 1166944
URL: http://svn.apache.org/viewvc?rev=1166944&view=rev
Log:
HDFS-1122. client block verification may result in blocks in DataBlockScanner prematurely. Contributed by Sam Rash.
Added:
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataBlockScanner.java
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1166944&r1=1166943&r2=1166944&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Sep 8 23:58:27 2011
@@ -101,6 +101,9 @@ Release 0.20.205.0 - unreleased
HDFS-2300. TestFileAppend4 and TestMultiThreadedSync failure. (jitendra)
+ HDFS-1122. client block verification may result in blocks in
+ DataBlockScanner prematurely. (Sam Rash via jitendra)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java?rev=1166944&r1=1166943&r2=1166944&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java Thu Sep 8 23:58:27 2011
@@ -298,13 +298,34 @@ class DataBlockScanner implements Runnab
}
}
- void verifiedByClient(Block block) {
- updateScanStatus(block, ScanType.REMOTE_READ, true);
+ /*
+ * A reader will try to indicate a block is verified and will add blocks to
+ * the DataBlockScanner before they are finished (due to concurrent readers).
+ *
+ * fixed so a read verification can't add the block
+ */
+ synchronized void verifiedByClient(Block block) {
+ updateScanStatusInternal(block, ScanType.REMOTE_READ, true, true);
}
- private synchronized void updateScanStatus(Block block,
- ScanType type,
- boolean scanOk) {
+ private synchronized void updateScanStatus(Block block, ScanType type,
+ boolean scanOk) {
+ updateScanStatusInternal(block, type, scanOk, false);
+ }
+
+ /**
+ * @param block
+ * - block to update status for
+ * @param type
+ * - client, DN, ...
+ * @param scanOk
+ * - result of scan
+ * @param updateOnly
+ * - if true, cannot add a block, but only update an existing block
+ */
+ private synchronized void updateScanStatusInternal(Block block,
+ ScanType type, boolean scanOk, boolean updateOnly) {
+
if (!isInitialized()) {
return;
}
@@ -313,6 +334,9 @@ class DataBlockScanner implements Runnab
if ( info != null ) {
delBlockInfo(info);
} else {
+ if (updateOnly) {
+ return;
+ }
// It might already be removed. Thats ok, it will be caught next time.
info = new BlockScanInfo(block);
}
@@ -614,7 +638,7 @@ class DataBlockScanner implements Runnab
log.close();
}
}
-
+
synchronized void printBlockReport(StringBuilder buffer,
boolean summaryOnly) {
long oneHour = 3600*1000;
Added: hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataBlockScanner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataBlockScanner.java?rev=1166944&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataBlockScanner.java (added)
+++ hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/server/datanode/TestDataBlockScanner.java Thu Sep 8 23:58:27 2011
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdfs.server.datanode;
+
+import java.io.IOException;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.BlockLocation;
+import org.apache.hadoop.fs.FSDataInputStream;
+import org.apache.hadoop.fs.FSDataOutputStream;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DFSTestUtil;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.server.namenode.FSNamesystem;
+import org.apache.hadoop.hdfs.server.namenode.LeaseManager;
+import org.apache.log4j.Level;
+import org.apache.commons.logging.impl.Log4JLogger;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestDataBlockScanner {
+ {
+ ((Log4JLogger) LeaseManager.LOG).getLogger().setLevel(Level.ALL);
+ ((Log4JLogger) FSNamesystem.LOG).getLogger().setLevel(Level.ALL);
+ ((Log4JLogger) DFSClient.LOG).getLogger().setLevel(Level.ALL);
+ }
+ static final int blockSize = 8192;
+ private MiniDFSCluster cluster;
+ private FileSystem fileSystem;
+
+
+ @Before
+ public void setUp() throws Exception {
+ final Configuration conf = new Configuration();
+ init(conf);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ cluster.shutdown();
+ }
+
+ private void init(Configuration conf) throws IOException {
+ if (cluster != null) {
+ cluster.shutdown();
+ }
+ cluster = new MiniDFSCluster(conf, 1, true, null);
+ cluster.waitClusterUp();
+ fileSystem = cluster.getFileSystem();
+ }
+
+ /**
+ * This test reads an open files and tests that client verification does not
+ * add a new block to the block-scanner map.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testPrematureDataBlockScannerAdd() throws IOException {
+ // create a new file in the root, write data, do not close
+ Path file1 = new Path("/unfinished-block");
+ FSDataOutputStream out = fileSystem.create(file1);
+
+ int writeSize = blockSize / 2;
+ out.write(DFSTestUtil.generateSequentialBytes(0, writeSize));
+ out.sync();
+
+ FSDataInputStream in = fileSystem.open(file1);
+
+ byte[] buf = new byte[4096];
+ in.readFully(0, buf);
+ in.close();
+
+ waitForBlocks(fileSystem, file1, 1, writeSize);
+
+ int blockMapSize = cluster.getDataNodes().get(0).blockScanner.blockMap.size();
+ Assert.assertEquals(String.format(
+ "%d entries in blockMap and it should be empty", blockMapSize), 0,
+ blockMapSize);
+ out.close();
+ }
+
+private void waitForBlocks(FileSystem fileSys, Path name, int blockCount, long length)
+ throws IOException {
+ // wait until we have at least one block in the file to read.
+ boolean done = false;
+
+ while (!done) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ done = true;
+ BlockLocation[] locations = fileSys.getFileBlockLocations(
+ fileSys.getFileStatus(name), 0, length);
+ if (locations.length < blockCount) {
+ done = false;
+ continue;
+ }
+ }
+ }
+}
\ No newline at end of file