HDDS-667. Fix TestOzoneFileInterfaces. Contributed by Mukul Kumar Singh.
This commit is contained in:
parent
25f8fcb064
commit
53e5173bd1
|
@ -53,6 +53,8 @@ import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Res
|
|||
public class BlockManagerImpl implements BlockManager {
|
||||
|
||||
static final Logger LOG = LoggerFactory.getLogger(BlockManagerImpl.class);
|
||||
private static byte[] blockCommitSequenceIdKey =
|
||||
DFSUtil.string2Bytes(OzoneConsts.BLOCK_COMMIT_SEQUENCE_ID_PREFIX);
|
||||
|
||||
private Configuration config;
|
||||
|
||||
|
@ -89,8 +91,6 @@ public class BlockManagerImpl implements BlockManager {
|
|||
Preconditions.checkNotNull(db, "DB cannot be null here");
|
||||
|
||||
long blockCommitSequenceId = data.getBlockCommitSequenceId();
|
||||
byte[] blockCommitSequenceIdKey =
|
||||
DFSUtil.string2Bytes(OzoneConsts.BLOCK_COMMIT_SEQUENCE_ID_PREFIX);
|
||||
byte[] blockCommitSequenceIdValue = db.get(blockCommitSequenceIdKey);
|
||||
|
||||
// default blockCommitSequenceId for any block is 0. It the putBlock
|
||||
|
|
|
@ -35,6 +35,7 @@ import org.apache.hadoop.ozone.client.OzoneClient;
|
|||
import org.apache.hadoop.ozone.client.OzoneClientFactory;
|
||||
import org.apache.hadoop.ozone.client.rest.OzoneException;
|
||||
import org.apache.hadoop.ozone.common.Storage.StorageState;
|
||||
import org.apache.hadoop.ozone.container.common.utils.ContainerCache;
|
||||
import org.apache.hadoop.ozone.om.OMConfigKeys;
|
||||
import org.apache.hadoop.ozone.om.OzoneManager;
|
||||
import org.apache.hadoop.hdds.scm.server.SCMStorage;
|
||||
|
@ -283,6 +284,7 @@ public final class MiniOzoneClusterImpl implements MiniOzoneCluster {
|
|||
scm.getClientProtocolServer().getScmInfo().getClusterId()));
|
||||
stop();
|
||||
FileUtils.deleteDirectory(baseDir);
|
||||
ContainerCache.getInstance(conf).shutdownCache();
|
||||
} catch (IOException e) {
|
||||
LOG.error("Exception while shutting down the cluster.", e);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue