Projects >> hadoop-common >>d10fe7e288550893acd29d713555c3c9313fd6b9

Chunk
Conflicting content 
import java.net.InetSocketAddress;
import java.net.NetworkInterface;
import java.net.Socket;
<<<<<<< HEAD
import java.net.URI;
=======
import java.net.SocketException;
import java.util.Collections;
>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
Solution content 
import java.net.InetSocketAddress;
import java.net.NetworkInterface;
import java.net.Socket;
import java.net.SocketException;
import java.net.URI;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
File
DFSClient.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.HashSet;
import java.util.List;
import java.util.Map;
<<<<<<< HEAD
=======
import java.util.Set;

>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
import javax.net.SocketFactory;

import org.apache.commons.logging.Log;
Solution content 
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.net.SocketFactory;

import org.apache.commons.logging.Log;
File
DFSClient.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.hadoop.security.token.TokenRenewer;
import org.apache.hadoop.util.DataChecksum;
import org.apache.hadoop.util.Progressable;
<<<<<<< HEAD
import org.apache.hadoop.util.ReflectionUtils;
=======
import org.apache.hadoop.hdfs.security.token.block.InvalidBlockTokenException;
>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68

/********************************************************
 * DFSClient can connect to a Hadoop Filesystem and
Solution content 
import org.apache.hadoop.security.token.TokenRenewer;
import org.apache.hadoop.util.DataChecksum;
import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.util.ReflectionUtils;

/********************************************************
 * DFSClient can connect to a Hadoop Filesystem and
File
DFSClient.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
   */
  private final Map filesBeingWritten
      = new HashMap();
<<<<<<< HEAD

=======
  private boolean shortCircuitLocalReads;
  
>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
  /**
   * Same as this(NameNode.getAddress(conf), conf);
   * @see #DFSClient(InetSocketAddress, Configuration)
Solution content 
   */
  private final Map filesBeingWritten
      = new HashMap();

  private boolean shortCircuitLocalReads;
  
  /**
   * Same as this(NameNode.getAddress(conf), conf);
   * @see #DFSClient(InetSocketAddress, Configuration)
File
DFSClient.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
  public static final String  DFS_DEFAULT_MAX_CORRUPT_FILES_RETURNED_KEY = "dfs.corruptfilesreturned.max";
  public static final int     DFS_DEFAULT_MAX_CORRUPT_FILES_RETURNED = 500;

<<<<<<< HEAD
=======
  public static final String DFS_CLIENT_READ_SHORTCIRCUIT_KEY = "dfs.client.read.shortcircuit";
  public static final boolean DFS_CLIENT_READ_SHORTCIRCUIT_DEFAULT = false;
  public static final String DFS_CLIENT_READ_SHORTCIRCUIT_SKIP_CHECKSUM_KEY = "dfs.client.read.shortcircuit.skip.checksum";
  public static final boolean DFS_CLIENT_READ_SHORTCIRCUIT_SKIP_CHECKSUM_DEFAULT = false;

>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
  // property for fsimage compression
  public static final String DFS_IMAGE_COMPRESS_KEY = "dfs.image.compress";
  public static final boolean DFS_IMAGE_COMPRESS_DEFAULT = false;
Solution content 
  public static final String  DFS_DEFAULT_MAX_CORRUPT_FILES_RETURNED_KEY = "dfs.corruptfilesreturned.max";
  public static final int     DFS_DEFAULT_MAX_CORRUPT_FILES_RETURNED = 500;

  public static final String DFS_CLIENT_READ_SHORTCIRCUIT_KEY = "dfs.client.read.shortcircuit";
  public static final boolean DFS_CLIENT_READ_SHORTCIRCUIT_DEFAULT = false;
  public static final String DFS_CLIENT_READ_SHORTCIRCUIT_SKIP_CHECKSUM_KEY = "dfs.client.read.shortcircuit.skip.checksum";
  public static final boolean DFS_CLIENT_READ_SHORTCIRCUIT_SKIP_CHECKSUM_DEFAULT = false;

  // property for fsimage compression
  public static final String DFS_IMAGE_COMPRESS_KEY = "dfs.image.compress";
  public static final boolean DFS_IMAGE_COMPRESS_DEFAULT = false;
File
DFSConfigKeys.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
  public static final String  DFS_NAMENODE_CHECKED_VOLUMES_KEY = "dfs.namenode.resource.checked.volumes";
  public static final String  DFS_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL_KEY = "dfs.web.authentication.kerberos.principal";
  public static final String  DFS_WEB_AUTHENTICATION_KERBEROS_KEYTAB_KEY = "dfs.web.authentication.kerberos.keytab";
<<<<<<< HEAD
  
  // HA related configuration
  public static final String DFS_HA_NAMENODES_KEY = "dfs.ha.namenodes";
  public static final String DFS_HA_NAMENODE_ID_KEY = "dfs.ha.namenode.id";
=======
  public static final String DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY = "dfs.block.local-path-access.user";
>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
}
Solution content 
  public static final String  DFS_NAMENODE_CHECKED_VOLUMES_KEY = "dfs.namenode.resource.checked.volumes";
  public static final String  DFS_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL_KEY = "dfs.web.authentication.kerberos.principal";
  public static final String  DFS_WEB_AUTHENTICATION_KERBEROS_KEYTAB_KEY = "dfs.web.authentication.kerberos.keytab";
  
  public static final String DFS_BLOCK_LOCAL_PATH_ACCESS_USER_KEY = "dfs.block.local-path-access.user";

  // HA related configuration
  public static final String DFS_HA_NAMENODES_KEY = "dfs.ha.namenodes";
  public static final String DFS_HA_NAMENODE_ID_KEY = "dfs.ha.namenode.id";
}
File
DFSConfigKeys.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
   * Given a configuration get the address of the service rpc server
   * If the service rpc is not configured returns null
   */
<<<<<<< HEAD
  protected InetSocketAddress getServiceRpcServerAddress(Configuration conf) {
    return NameNode.getServiceAddress(conf, false);
  }

  protected InetSocketAddress getRpcServerAddress(Configuration conf) {
=======
  protected InetSocketAddress getServiceRpcServerAddress(Configuration conf)
      throws IOException {
    return NameNode.getServiceAddress(conf, false);
  }

  protected InetSocketAddress getRpcServerAddress(Configuration conf)
      throws IOException {
>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
    return getAddress(conf);
  }
Solution content 
   * Given a configuration get the address of the service rpc server
   * If the service rpc is not configured returns null
   */
  protected InetSocketAddress getServiceRpcServerAddress(Configuration conf) {
    return NameNode.getServiceAddress(conf, false);
  }

  protected InetSocketAddress getRpcServerAddress(Configuration conf) {
    return getAddress(conf);
  }
File
NameNode.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method signature
Chunk
Conflicting content 
      String nameserviceId, int nnPort) {
  private static void initFederatedNamenodeAddress(Configuration conf,
    // Set nameserviceId specific key
<<<<<<< HEAD
    String key = DFSUtil.addKeySuffixes(
        DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY, nameserviceId);
    conf.set(key, "127.0.0.1:0");

    key = DFSUtil.addKeySuffixes(
        DFSConfigKeys.DFS_NAMENODE_RPC_ADDRESS_KEY, nameserviceId);
=======
    String key = DFSUtil.getNameServiceIdKey(
        DFS_NAMENODE_HTTP_ADDRESS_KEY, nameserviceId);
    conf.set(key, "127.0.0.1:0");

    key = DFSUtil.getNameServiceIdKey(
        DFS_NAMENODE_RPC_ADDRESS_KEY, nameserviceId);
>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
    conf.set(key, "127.0.0.1:" + nnPort);
  }
Solution content 
  private static void initFederatedNamenodeAddress(Configuration conf,
      String nameserviceId, int nnPort) {
    // Set nameserviceId specific key
    String key = DFSUtil.addKeySuffixes(
        DFS_NAMENODE_HTTP_ADDRESS_KEY, nameserviceId);
    conf.set(key, "127.0.0.1:0");

    key = DFSUtil.addKeySuffixes(
        DFS_NAMENODE_RPC_ADDRESS_KEY, nameserviceId);
    conf.set(key, "127.0.0.1:" + nnPort);
  }
File
MiniDFSCluster.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    conf.set(DFS_FEDERATION_NAMESERVICE_ID, nameserviceId);
    NameNode nn = createNameNode(nnIndex, conf, numDataNodes, manageNameDfsDirs,
        format, operation, clusterId);
<<<<<<< HEAD
    conf.set(DFSUtil.addKeySuffixes(
        DFSConfigKeys.DFS_NAMENODE_RPC_ADDRESS_KEY, nameserviceId), NameNode
        .getHostPortString(nn.getNameNodeAddress()));
    conf.set(DFSUtil.addKeySuffixes(
        DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY, nameserviceId), NameNode
=======
    conf.set(DFSUtil.getNameServiceIdKey(
        DFS_NAMENODE_RPC_ADDRESS_KEY, nameserviceId), NameNode
        .getHostPortString(nn.getNameNodeAddress()));
    conf.set(DFSUtil.getNameServiceIdKey(
        DFS_NAMENODE_HTTP_ADDRESS_KEY, nameserviceId), NameNode
>>>>>>> b6593f3e0eceec0e3e59d80f9a9dae0928f96d68
        .getHostPortString(nn.getHttpAddress()));
    DFSUtil.setGenericConf(conf, nameserviceId, 
        DFS_NAMENODE_HTTP_ADDRESS_KEY);
Solution content 
    conf.set(DFS_FEDERATION_NAMESERVICE_ID, nameserviceId);
    NameNode nn = createNameNode(nnIndex, conf, numDataNodes, manageNameDfsDirs,
        format, operation, clusterId);
    conf.set(DFSUtil.addKeySuffixes(
        DFS_NAMENODE_RPC_ADDRESS_KEY, nameserviceId), NameNode
        .getHostPortString(nn.getNameNodeAddress()));
    conf.set(DFSUtil.addKeySuffixes(
        DFS_NAMENODE_HTTP_ADDRESS_KEY, nameserviceId), NameNode
        .getHostPortString(nn.getHttpAddress()));
    DFSUtil.setGenericConf(conf, nameserviceId, 
        DFS_NAMENODE_HTTP_ADDRESS_KEY);
File
MiniDFSCluster.java
Developer's decision
Combination
Kind of conflict
Method invocation