HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Colin McCabe
parent
7d86f49109
commit
5324b77a60
|
|
@ -169,6 +169,9 @@ Release 2.2.1 - UNRELEASED
|
||||||
|
|
||||||
HADOOP-9898. Set SO_KEEPALIVE on all our sockets. (todd via wang)
|
HADOOP-9898. Set SO_KEEPALIVE on all our sockets. (todd via wang)
|
||||||
|
|
||||||
|
HADOOP-9478. Fix race conditions during the initialization of Configuration
|
||||||
|
related to deprecatedKeyMap (cmccabe)
|
||||||
|
|
||||||
Release 2.2.0 - 2013-10-13
|
Release 2.2.0 - 2013-10-13
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.regex.PatternSyntaxException;
|
import java.util.regex.PatternSyntaxException;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
import javax.xml.parsers.DocumentBuilder;
|
import javax.xml.parsers.DocumentBuilder;
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
import javax.xml.parsers.DocumentBuilderFactory;
|
||||||
|
|
@ -65,6 +67,7 @@ import javax.xml.transform.TransformerFactory;
|
||||||
import javax.xml.transform.dom.DOMSource;
|
import javax.xml.transform.dom.DOMSource;
|
||||||
import javax.xml.transform.stream.StreamResult;
|
import javax.xml.transform.stream.StreamResult;
|
||||||
|
|
||||||
|
import org.apache.commons.collections.map.UnmodifiableMap;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.hadoop.classification.InterfaceAudience;
|
import org.apache.hadoop.classification.InterfaceAudience;
|
||||||
|
|
@ -87,6 +90,7 @@ import org.w3c.dom.Node;
|
||||||
import org.w3c.dom.NodeList;
|
import org.w3c.dom.NodeList;
|
||||||
import org.w3c.dom.Text;
|
import org.w3c.dom.Text;
|
||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
|
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -254,13 +258,13 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* warning message which can be logged whenever the deprecated key is used.
|
* warning message which can be logged whenever the deprecated key is used.
|
||||||
*/
|
*/
|
||||||
private static class DeprecatedKeyInfo {
|
private static class DeprecatedKeyInfo {
|
||||||
private String[] newKeys;
|
private final String[] newKeys;
|
||||||
private String customMessage;
|
private final String customMessage;
|
||||||
private boolean accessed;
|
private final AtomicBoolean accessed = new AtomicBoolean(false);
|
||||||
|
|
||||||
DeprecatedKeyInfo(String[] newKeys, String customMessage) {
|
DeprecatedKeyInfo(String[] newKeys, String customMessage) {
|
||||||
this.newKeys = newKeys;
|
this.newKeys = newKeys;
|
||||||
this.customMessage = customMessage;
|
this.customMessage = customMessage;
|
||||||
accessed = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -286,26 +290,170 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
else {
|
else {
|
||||||
warningMessage = customMessage;
|
warningMessage = customMessage;
|
||||||
}
|
}
|
||||||
accessed = true;
|
|
||||||
return warningMessage;
|
return warningMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean getAndSetAccessed() {
|
||||||
|
return accessed.getAndSet(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clearAccessed() {
|
||||||
|
accessed.set(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores the deprecated keys, the new keys which replace the deprecated keys
|
* A pending addition to the global set of deprecated keys.
|
||||||
* and custom message(if any provided).
|
|
||||||
*/
|
*/
|
||||||
private static Map<String, DeprecatedKeyInfo> deprecatedKeyMap =
|
public static class DeprecationDelta {
|
||||||
new HashMap<String, DeprecatedKeyInfo>();
|
private final String key;
|
||||||
|
private final String[] newKeys;
|
||||||
|
private final String customMessage;
|
||||||
|
|
||||||
|
DeprecationDelta(String key, String[] newKeys, String customMessage) {
|
||||||
|
Preconditions.checkNotNull(key);
|
||||||
|
Preconditions.checkNotNull(newKeys);
|
||||||
|
Preconditions.checkArgument(newKeys.length > 0);
|
||||||
|
this.key = key;
|
||||||
|
this.newKeys = newKeys;
|
||||||
|
this.customMessage = customMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DeprecationDelta(String key, String newKey, String customMessage) {
|
||||||
|
this(key, new String[] { newKey }, customMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DeprecationDelta(String key, String newKey) {
|
||||||
|
this(key, new String[] { newKey }, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getKey() {
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String[] getNewKeys() {
|
||||||
|
return newKeys;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getCustomMessage() {
|
||||||
|
return customMessage;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores a mapping from superseding keys to the keys which they deprecate.
|
* The set of all keys which are deprecated.
|
||||||
|
*
|
||||||
|
* DeprecationContext objects are immutable.
|
||||||
*/
|
*/
|
||||||
private static Map<String, String> reverseDeprecatedKeyMap =
|
private static class DeprecationContext {
|
||||||
new HashMap<String, String>();
|
/**
|
||||||
|
* Stores the deprecated keys, the new keys which replace the deprecated keys
|
||||||
|
* and custom message(if any provided).
|
||||||
|
*/
|
||||||
|
private final Map<String, DeprecatedKeyInfo> deprecatedKeyMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stores a mapping from superseding keys to the keys which they deprecate.
|
||||||
|
*/
|
||||||
|
private final Map<String, String> reverseDeprecatedKeyMap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new DeprecationContext by copying a previous DeprecationContext
|
||||||
|
* and adding some deltas.
|
||||||
|
*
|
||||||
|
* @param other The previous deprecation context to copy, or null to start
|
||||||
|
* from nothing.
|
||||||
|
* @param deltas The deltas to apply.
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
DeprecationContext(DeprecationContext other, DeprecationDelta[] deltas) {
|
||||||
|
HashMap<String, DeprecatedKeyInfo> newDeprecatedKeyMap =
|
||||||
|
new HashMap<String, DeprecatedKeyInfo>();
|
||||||
|
HashMap<String, String> newReverseDeprecatedKeyMap =
|
||||||
|
new HashMap<String, String>();
|
||||||
|
if (other != null) {
|
||||||
|
for (Entry<String, DeprecatedKeyInfo> entry :
|
||||||
|
other.deprecatedKeyMap.entrySet()) {
|
||||||
|
newDeprecatedKeyMap.put(entry.getKey(), entry.getValue());
|
||||||
|
}
|
||||||
|
for (Entry<String, String> entry :
|
||||||
|
other.reverseDeprecatedKeyMap.entrySet()) {
|
||||||
|
newReverseDeprecatedKeyMap.put(entry.getKey(), entry.getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (DeprecationDelta delta : deltas) {
|
||||||
|
if (!newDeprecatedKeyMap.containsKey(delta.getKey())) {
|
||||||
|
DeprecatedKeyInfo newKeyInfo =
|
||||||
|
new DeprecatedKeyInfo(delta.getNewKeys(), delta.getCustomMessage());
|
||||||
|
newDeprecatedKeyMap.put(delta.key, newKeyInfo);
|
||||||
|
for (String newKey : delta.getNewKeys()) {
|
||||||
|
newReverseDeprecatedKeyMap.put(newKey, delta.key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.deprecatedKeyMap =
|
||||||
|
UnmodifiableMap.decorate(newDeprecatedKeyMap);
|
||||||
|
this.reverseDeprecatedKeyMap =
|
||||||
|
UnmodifiableMap.decorate(newReverseDeprecatedKeyMap);
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, DeprecatedKeyInfo> getDeprecatedKeyMap() {
|
||||||
|
return deprecatedKeyMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, String> getReverseDeprecatedKeyMap() {
|
||||||
|
return reverseDeprecatedKeyMap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static DeprecationDelta[] defaultDeprecations =
|
||||||
|
new DeprecationDelta[] {
|
||||||
|
new DeprecationDelta("topology.script.file.name",
|
||||||
|
CommonConfigurationKeys.NET_TOPOLOGY_SCRIPT_FILE_NAME_KEY),
|
||||||
|
new DeprecationDelta("topology.script.number.args",
|
||||||
|
CommonConfigurationKeys.NET_TOPOLOGY_SCRIPT_NUMBER_ARGS_KEY),
|
||||||
|
new DeprecationDelta("hadoop.configured.node.mapping",
|
||||||
|
CommonConfigurationKeys.NET_TOPOLOGY_CONFIGURED_NODE_MAPPING_KEY),
|
||||||
|
new DeprecationDelta("topology.node.switch.mapping.impl",
|
||||||
|
CommonConfigurationKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY),
|
||||||
|
new DeprecationDelta("dfs.df.interval",
|
||||||
|
CommonConfigurationKeys.FS_DF_INTERVAL_KEY),
|
||||||
|
new DeprecationDelta("hadoop.native.lib",
|
||||||
|
CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY),
|
||||||
|
new DeprecationDelta("fs.default.name",
|
||||||
|
CommonConfigurationKeys.FS_DEFAULT_NAME_KEY),
|
||||||
|
new DeprecationDelta("dfs.umaskmode",
|
||||||
|
CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY)
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the deprecated key to the deprecation map.
|
* The global DeprecationContext.
|
||||||
|
*/
|
||||||
|
private static AtomicReference<DeprecationContext> deprecationContext =
|
||||||
|
new AtomicReference<DeprecationContext>(
|
||||||
|
new DeprecationContext(null, defaultDeprecations));
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds a set of deprecated keys to the global deprecations.
|
||||||
|
*
|
||||||
|
* This method is lockless. It works by means of creating a new
|
||||||
|
* DeprecationContext based on the old one, and then atomically swapping in
|
||||||
|
* the new context. If someone else updated the context in between us reading
|
||||||
|
* the old context and swapping in the new one, we try again until we win the
|
||||||
|
* race.
|
||||||
|
*
|
||||||
|
* @param deltas The deprecations to add.
|
||||||
|
*/
|
||||||
|
public static void addDeprecations(DeprecationDelta[] deltas) {
|
||||||
|
DeprecationContext prev, next;
|
||||||
|
do {
|
||||||
|
prev = deprecationContext.get();
|
||||||
|
next = new DeprecationContext(prev, deltas);
|
||||||
|
} while (!deprecationContext.compareAndSet(prev, next));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds the deprecated key to the global deprecation map.
|
||||||
* It does not override any existing entries in the deprecation map.
|
* It does not override any existing entries in the deprecation map.
|
||||||
* This is to be used only by the developers in order to add deprecation of
|
* This is to be used only by the developers in order to add deprecation of
|
||||||
* keys, and attempts to call this method after loading resources once,
|
* keys, and attempts to call this method after loading resources once,
|
||||||
|
|
@ -315,6 +463,9 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* aliases of each other, and setting any one of them resets all the others
|
* aliases of each other, and setting any one of them resets all the others
|
||||||
* to the new value.
|
* to the new value.
|
||||||
*
|
*
|
||||||
|
* If you have multiple deprecation entries to add, it is more efficient to
|
||||||
|
* use #addDeprecations(DeprecationDelta[] deltas) instead.
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param newKeys
|
* @param newKeys
|
||||||
* @param customMessage
|
* @param customMessage
|
||||||
|
|
@ -322,41 +473,35 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
String customMessage)} instead
|
String customMessage)} instead
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public synchronized static void addDeprecation(String key, String[] newKeys,
|
public static void addDeprecation(String key, String[] newKeys,
|
||||||
String customMessage) {
|
String customMessage) {
|
||||||
if (key == null || key.length() == 0 ||
|
addDeprecations(new DeprecationDelta[] {
|
||||||
newKeys == null || newKeys.length == 0) {
|
new DeprecationDelta(key, newKeys, customMessage)
|
||||||
throw new IllegalArgumentException();
|
});
|
||||||
}
|
|
||||||
if (!isDeprecated(key)) {
|
|
||||||
DeprecatedKeyInfo newKeyInfo;
|
|
||||||
newKeyInfo = new DeprecatedKeyInfo(newKeys, customMessage);
|
|
||||||
deprecatedKeyMap.put(key, newKeyInfo);
|
|
||||||
for (String newKey : newKeys) {
|
|
||||||
reverseDeprecatedKeyMap.put(newKey, key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the deprecated key to the deprecation map.
|
* Adds the deprecated key to the global deprecation map.
|
||||||
* It does not override any existing entries in the deprecation map.
|
* It does not override any existing entries in the deprecation map.
|
||||||
* This is to be used only by the developers in order to add deprecation of
|
* This is to be used only by the developers in order to add deprecation of
|
||||||
* keys, and attempts to call this method after loading resources once,
|
* keys, and attempts to call this method after loading resources once,
|
||||||
* would lead to <tt>UnsupportedOperationException</tt>
|
* would lead to <tt>UnsupportedOperationException</tt>
|
||||||
*
|
*
|
||||||
|
* If you have multiple deprecation entries to add, it is more efficient to
|
||||||
|
* use #addDeprecations(DeprecationDelta[] deltas) instead.
|
||||||
|
*
|
||||||
* @param key
|
* @param key
|
||||||
* @param newKey
|
* @param newKey
|
||||||
* @param customMessage
|
* @param customMessage
|
||||||
*/
|
*/
|
||||||
public synchronized static void addDeprecation(String key, String newKey,
|
public static void addDeprecation(String key, String newKey,
|
||||||
String customMessage) {
|
String customMessage) {
|
||||||
addDeprecation(key, new String[] {newKey}, customMessage);
|
addDeprecation(key, new String[] {newKey}, customMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the deprecated key to the deprecation map when no custom message
|
* Adds the deprecated key to the global deprecation map when no custom
|
||||||
* is provided.
|
* message is provided.
|
||||||
* It does not override any existing entries in the deprecation map.
|
* It does not override any existing entries in the deprecation map.
|
||||||
* This is to be used only by the developers in order to add deprecation of
|
* This is to be used only by the developers in order to add deprecation of
|
||||||
* keys, and attempts to call this method after loading resources once,
|
* keys, and attempts to call this method after loading resources once,
|
||||||
|
|
@ -366,28 +511,34 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* aliases of each other, and setting any one of them resets all the others
|
* aliases of each other, and setting any one of them resets all the others
|
||||||
* to the new value.
|
* to the new value.
|
||||||
*
|
*
|
||||||
|
* If you have multiple deprecation entries to add, it is more efficient to
|
||||||
|
* use #addDeprecations(DeprecationDelta[] deltas) instead.
|
||||||
|
*
|
||||||
* @param key Key that is to be deprecated
|
* @param key Key that is to be deprecated
|
||||||
* @param newKeys list of keys that take up the values of deprecated key
|
* @param newKeys list of keys that take up the values of deprecated key
|
||||||
* @deprecated use {@link #addDeprecation(String key, String newKey)} instead
|
* @deprecated use {@link #addDeprecation(String key, String newKey)} instead
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public synchronized static void addDeprecation(String key, String[] newKeys) {
|
public static void addDeprecation(String key, String[] newKeys) {
|
||||||
addDeprecation(key, newKeys, null);
|
addDeprecation(key, newKeys, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds the deprecated key to the deprecation map when no custom message
|
* Adds the deprecated key to the global deprecation map when no custom
|
||||||
* is provided.
|
* message is provided.
|
||||||
* It does not override any existing entries in the deprecation map.
|
* It does not override any existing entries in the deprecation map.
|
||||||
* This is to be used only by the developers in order to add deprecation of
|
* This is to be used only by the developers in order to add deprecation of
|
||||||
* keys, and attempts to call this method after loading resources once,
|
* keys, and attempts to call this method after loading resources once,
|
||||||
* would lead to <tt>UnsupportedOperationException</tt>
|
* would lead to <tt>UnsupportedOperationException</tt>
|
||||||
*
|
*
|
||||||
|
* If you have multiple deprecation entries to add, it is more efficient to
|
||||||
|
* use #addDeprecations(DeprecationDelta[] deltas) instead.
|
||||||
|
*
|
||||||
* @param key Key that is to be deprecated
|
* @param key Key that is to be deprecated
|
||||||
* @param newKey key that takes up the value of deprecated key
|
* @param newKey key that takes up the value of deprecated key
|
||||||
*/
|
*/
|
||||||
public synchronized static void addDeprecation(String key, String newKey) {
|
public static void addDeprecation(String key, String newKey) {
|
||||||
addDeprecation(key, new String[] {newKey}, null);
|
addDeprecation(key, new String[] {newKey}, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -398,7 +549,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* <code>false</code> otherwise.
|
* <code>false</code> otherwise.
|
||||||
*/
|
*/
|
||||||
public static boolean isDeprecated(String key) {
|
public static boolean isDeprecated(String key) {
|
||||||
return deprecatedKeyMap.containsKey(key);
|
return deprecationContext.get().getDeprecatedKeyMap().containsKey(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -410,13 +561,14 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
*/
|
*/
|
||||||
private String[] getAlternateNames(String name) {
|
private String[] getAlternateNames(String name) {
|
||||||
String altNames[] = null;
|
String altNames[] = null;
|
||||||
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
|
DeprecationContext cur = deprecationContext.get();
|
||||||
|
DeprecatedKeyInfo keyInfo = cur.getDeprecatedKeyMap().get(name);
|
||||||
if (keyInfo == null) {
|
if (keyInfo == null) {
|
||||||
altNames = (reverseDeprecatedKeyMap.get(name) != null ) ?
|
altNames = (cur.getReverseDeprecatedKeyMap().get(name) != null ) ?
|
||||||
new String [] {reverseDeprecatedKeyMap.get(name)} : null;
|
new String [] {cur.getReverseDeprecatedKeyMap().get(name)} : null;
|
||||||
if(altNames != null && altNames.length > 0) {
|
if(altNames != null && altNames.length > 0) {
|
||||||
//To help look for other new configs for this deprecated config
|
//To help look for other new configs for this deprecated config
|
||||||
keyInfo = deprecatedKeyMap.get(altNames[0]);
|
keyInfo = cur.getDeprecatedKeyMap().get(altNames[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(keyInfo != null && keyInfo.newKeys.length > 0) {
|
if(keyInfo != null && keyInfo.newKeys.length > 0) {
|
||||||
|
|
@ -442,11 +594,12 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* @return the first property in the list of properties mapping
|
* @return the first property in the list of properties mapping
|
||||||
* the <code>name</code> or the <code>name</code> itself.
|
* the <code>name</code> or the <code>name</code> itself.
|
||||||
*/
|
*/
|
||||||
private String[] handleDeprecation(String name) {
|
private String[] handleDeprecation(DeprecationContext deprecations,
|
||||||
|
String name) {
|
||||||
ArrayList<String > names = new ArrayList<String>();
|
ArrayList<String > names = new ArrayList<String>();
|
||||||
if (isDeprecated(name)) {
|
if (isDeprecated(name)) {
|
||||||
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
|
DeprecatedKeyInfo keyInfo = deprecations.getDeprecatedKeyMap().get(name);
|
||||||
warnOnceIfDeprecated(name);
|
warnOnceIfDeprecated(deprecations, name);
|
||||||
for (String newKey : keyInfo.newKeys) {
|
for (String newKey : keyInfo.newKeys) {
|
||||||
if(newKey != null) {
|
if(newKey != null) {
|
||||||
names.add(newKey);
|
names.add(newKey);
|
||||||
|
|
@ -457,7 +610,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
names.add(name);
|
names.add(name);
|
||||||
}
|
}
|
||||||
for(String n : names) {
|
for(String n : names) {
|
||||||
String deprecatedKey = reverseDeprecatedKeyMap.get(n);
|
String deprecatedKey = deprecations.getReverseDeprecatedKeyMap().get(n);
|
||||||
if (deprecatedKey != null && !getOverlay().containsKey(n) &&
|
if (deprecatedKey != null && !getOverlay().containsKey(n) &&
|
||||||
getOverlay().containsKey(deprecatedKey)) {
|
getOverlay().containsKey(deprecatedKey)) {
|
||||||
getProps().setProperty(n, getOverlay().getProperty(deprecatedKey));
|
getProps().setProperty(n, getOverlay().getProperty(deprecatedKey));
|
||||||
|
|
@ -469,11 +622,12 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
|
|
||||||
private void handleDeprecation() {
|
private void handleDeprecation() {
|
||||||
LOG.debug("Handling deprecation for all properties in config...");
|
LOG.debug("Handling deprecation for all properties in config...");
|
||||||
|
DeprecationContext deprecations = deprecationContext.get();
|
||||||
Set<Object> keys = new HashSet<Object>();
|
Set<Object> keys = new HashSet<Object>();
|
||||||
keys.addAll(getProps().keySet());
|
keys.addAll(getProps().keySet());
|
||||||
for (Object item: keys) {
|
for (Object item: keys) {
|
||||||
LOG.debug("Handling deprecation for " + (String)item);
|
LOG.debug("Handling deprecation for " + (String)item);
|
||||||
handleDeprecation((String)item);
|
handleDeprecation(deprecations, (String)item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -492,13 +646,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
}
|
}
|
||||||
addDefaultResource("core-default.xml");
|
addDefaultResource("core-default.xml");
|
||||||
addDefaultResource("core-site.xml");
|
addDefaultResource("core-site.xml");
|
||||||
//Add code for managing deprecated key mapping
|
|
||||||
//for example
|
|
||||||
//addDeprecation("oldKey1",new String[]{"newkey1","newkey2"});
|
|
||||||
//adds deprecation for oldKey1 to two new keys(newkey1, newkey2).
|
|
||||||
//so get or set of oldKey1 will correctly populate/access values of
|
|
||||||
//newkey1 and newkey2
|
|
||||||
addDeprecatedKeys();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Properties properties;
|
private Properties properties;
|
||||||
|
|
@ -715,7 +862,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* or null if no such property exists.
|
* or null if no such property exists.
|
||||||
*/
|
*/
|
||||||
public String get(String name) {
|
public String get(String name) {
|
||||||
String[] names = handleDeprecation(name);
|
String[] names = handleDeprecation(deprecationContext.get(), name);
|
||||||
String result = null;
|
String result = null;
|
||||||
for(String n : names) {
|
for(String n : names) {
|
||||||
result = substituteVars(getProps().getProperty(n));
|
result = substituteVars(getProps().getProperty(n));
|
||||||
|
|
@ -772,7 +919,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* its replacing property and null if no such property exists.
|
* its replacing property and null if no such property exists.
|
||||||
*/
|
*/
|
||||||
public String getRaw(String name) {
|
public String getRaw(String name) {
|
||||||
String[] names = handleDeprecation(name);
|
String[] names = handleDeprecation(deprecationContext.get(), name);
|
||||||
String result = null;
|
String result = null;
|
||||||
for(String n : names) {
|
for(String n : names) {
|
||||||
result = getProps().getProperty(n);
|
result = getProps().getProperty(n);
|
||||||
|
|
@ -810,7 +957,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
Preconditions.checkArgument(
|
Preconditions.checkArgument(
|
||||||
value != null,
|
value != null,
|
||||||
"Property value must not be null");
|
"Property value must not be null");
|
||||||
if (deprecatedKeyMap.isEmpty()) {
|
DeprecationContext deprecations = deprecationContext.get();
|
||||||
|
if (deprecations.getDeprecatedKeyMap().isEmpty()) {
|
||||||
getProps();
|
getProps();
|
||||||
}
|
}
|
||||||
getOverlay().setProperty(name, value);
|
getOverlay().setProperty(name, value);
|
||||||
|
|
@ -831,12 +979,12 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
warnOnceIfDeprecated(name);
|
warnOnceIfDeprecated(deprecations, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void warnOnceIfDeprecated(String name) {
|
private void warnOnceIfDeprecated(DeprecationContext deprecations, String name) {
|
||||||
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(name);
|
DeprecatedKeyInfo keyInfo = deprecations.getDeprecatedKeyMap().get(name);
|
||||||
if (keyInfo != null && !keyInfo.accessed) {
|
if (keyInfo != null && !keyInfo.getAndSetAccessed()) {
|
||||||
LOG_DEPRECATION.info(keyInfo.getWarningMessage(name));
|
LOG_DEPRECATION.info(keyInfo.getWarningMessage(name));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -887,7 +1035,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
* doesn't exist.
|
* doesn't exist.
|
||||||
*/
|
*/
|
||||||
public String get(String name, String defaultValue) {
|
public String get(String name, String defaultValue) {
|
||||||
String[] names = handleDeprecation(name);
|
String[] names = handleDeprecation(deprecationContext.get(), name);
|
||||||
String result = null;
|
String result = null;
|
||||||
for(String n : names) {
|
for(String n : names) {
|
||||||
result = substituteVars(getProps().getProperty(n, defaultValue));
|
result = substituteVars(getProps().getProperty(n, defaultValue));
|
||||||
|
|
@ -2092,6 +2240,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
if (!"configuration".equals(root.getTagName()))
|
if (!"configuration".equals(root.getTagName()))
|
||||||
LOG.fatal("bad conf file: top-level element not <configuration>");
|
LOG.fatal("bad conf file: top-level element not <configuration>");
|
||||||
NodeList props = root.getChildNodes();
|
NodeList props = root.getChildNodes();
|
||||||
|
DeprecationContext deprecations = deprecationContext.get();
|
||||||
for (int i = 0; i < props.getLength(); i++) {
|
for (int i = 0; i < props.getLength(); i++) {
|
||||||
Node propNode = props.item(i);
|
Node propNode = props.item(i);
|
||||||
if (!(propNode instanceof Element))
|
if (!(propNode instanceof Element))
|
||||||
|
|
@ -2129,9 +2278,10 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
|
|
||||||
// Ignore this parameter if it has already been marked as 'final'
|
// Ignore this parameter if it has already been marked as 'final'
|
||||||
if (attr != null) {
|
if (attr != null) {
|
||||||
if (deprecatedKeyMap.containsKey(attr)) {
|
if (deprecations.getDeprecatedKeyMap().containsKey(attr)) {
|
||||||
DeprecatedKeyInfo keyInfo = deprecatedKeyMap.get(attr);
|
DeprecatedKeyInfo keyInfo =
|
||||||
keyInfo.accessed = false;
|
deprecations.getDeprecatedKeyMap().get(attr);
|
||||||
|
keyInfo.clearAccessed();
|
||||||
for (String key:keyInfo.newKeys) {
|
for (String key:keyInfo.newKeys) {
|
||||||
// update new keys with deprecated key's value
|
// update new keys with deprecated key's value
|
||||||
loadProperty(toAddTo, name, key, value, finalParameter,
|
loadProperty(toAddTo, name, key, value, finalParameter,
|
||||||
|
|
@ -2425,26 +2575,6 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Load deprecated keys in common
|
|
||||||
private static void addDeprecatedKeys() {
|
|
||||||
Configuration.addDeprecation("topology.script.file.name",
|
|
||||||
new String[]{CommonConfigurationKeys.NET_TOPOLOGY_SCRIPT_FILE_NAME_KEY});
|
|
||||||
Configuration.addDeprecation("topology.script.number.args",
|
|
||||||
new String[]{CommonConfigurationKeys.NET_TOPOLOGY_SCRIPT_NUMBER_ARGS_KEY});
|
|
||||||
Configuration.addDeprecation("hadoop.configured.node.mapping",
|
|
||||||
new String[]{CommonConfigurationKeys.NET_TOPOLOGY_CONFIGURED_NODE_MAPPING_KEY});
|
|
||||||
Configuration.addDeprecation("topology.node.switch.mapping.impl",
|
|
||||||
new String[]{CommonConfigurationKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY});
|
|
||||||
Configuration.addDeprecation("dfs.df.interval",
|
|
||||||
new String[]{CommonConfigurationKeys.FS_DF_INTERVAL_KEY});
|
|
||||||
Configuration.addDeprecation("hadoop.native.lib",
|
|
||||||
new String[]{CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY});
|
|
||||||
Configuration.addDeprecation("fs.default.name",
|
|
||||||
new String[]{CommonConfigurationKeys.FS_DEFAULT_NAME_KEY});
|
|
||||||
Configuration.addDeprecation("dfs.umaskmode",
|
|
||||||
new String[]{CommonConfigurationKeys.FS_PERMISSIONS_UMASK_KEY});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A unique class which is used as a sentinel value in the caching
|
* A unique class which is used as a sentinel value in the caching
|
||||||
* for getClassByName. {@see Configuration#getClassByNameOrNull(String)}
|
* for getClassByName. {@see Configuration#getClassByNameOrNull(String)}
|
||||||
|
|
@ -2452,12 +2582,14 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
||||||
private static abstract class NegativeCacheSentinel {}
|
private static abstract class NegativeCacheSentinel {}
|
||||||
|
|
||||||
public static void dumpDeprecatedKeys() {
|
public static void dumpDeprecatedKeys() {
|
||||||
for (Map.Entry<String, DeprecatedKeyInfo> entry : deprecatedKeyMap.entrySet()) {
|
DeprecationContext deprecations = deprecationContext.get();
|
||||||
String newKeys = "";
|
for (Map.Entry<String, DeprecatedKeyInfo> entry :
|
||||||
|
deprecations.getDeprecatedKeyMap().entrySet()) {
|
||||||
|
StringBuilder newKeys = new StringBuilder();
|
||||||
for (String newKey : entry.getValue().newKeys) {
|
for (String newKey : entry.getValue().newKeys) {
|
||||||
newKeys += newKey + "\t";
|
newKeys.append(newKey).append("\t");
|
||||||
}
|
}
|
||||||
System.out.println(entry.getKey() + "\t" + newKeys);
|
System.out.println(entry.getKey() + "\t" + newKeys.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,13 +26,28 @@ import java.io.BufferedWriter;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.concurrent.Callable;
|
||||||
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
import java.util.concurrent.Future;
|
||||||
|
import java.util.concurrent.ScheduledThreadPoolExecutor;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
import junit.framework.Assert;
|
||||||
|
|
||||||
import org.apache.hadoop.fs.Path;
|
import org.apache.hadoop.fs.Path;
|
||||||
|
import org.apache.hadoop.conf.Configuration.DeprecationDelta;
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import com.google.common.util.concurrent.ThreadFactoryBuilder;
|
||||||
|
import com.google.common.util.concurrent.Uninterruptibles;
|
||||||
|
|
||||||
|
|
||||||
public class TestConfigurationDeprecation {
|
public class TestConfigurationDeprecation {
|
||||||
private Configuration conf;
|
private Configuration conf;
|
||||||
|
|
@ -320,4 +335,68 @@ public class TestConfigurationDeprecation {
|
||||||
assertNull(conf.get("nK"));
|
assertNull(conf.get("nK"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static String getTestKeyName(int threadIndex, int testIndex) {
|
||||||
|
return "testConcurrentDeprecateAndManipulate.testKey." +
|
||||||
|
threadIndex + "." + testIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run a set of threads making changes to the deprecations
|
||||||
|
* concurrently with another set of threads calling get()
|
||||||
|
* and set() on Configuration objects.
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
@Test(timeout=60000)
|
||||||
|
public void testConcurrentDeprecateAndManipulate() throws Exception {
|
||||||
|
final int NUM_THREAD_IDS = 10;
|
||||||
|
final int NUM_KEYS_PER_THREAD = 1000;
|
||||||
|
ScheduledThreadPoolExecutor executor =
|
||||||
|
new ScheduledThreadPoolExecutor(2 * NUM_THREAD_IDS,
|
||||||
|
new ThreadFactoryBuilder().setDaemon(true).
|
||||||
|
setNameFormat("testConcurrentDeprecateAndManipulate modification thread %d").
|
||||||
|
build());
|
||||||
|
final CountDownLatch latch = new CountDownLatch(1);
|
||||||
|
final AtomicInteger highestModificationThreadId = new AtomicInteger(1);
|
||||||
|
List<Future<Void>> futures = new LinkedList<Future<Void>>();
|
||||||
|
for (int i = 0; i < NUM_THREAD_IDS; i++) {
|
||||||
|
futures.add(executor.schedule(new Callable<Void>() {
|
||||||
|
@Override
|
||||||
|
public Void call() throws Exception {
|
||||||
|
latch.await();
|
||||||
|
int threadIndex = highestModificationThreadId.addAndGet(1);
|
||||||
|
for (int i = 0; i < NUM_KEYS_PER_THREAD; i++) {
|
||||||
|
String testKey = getTestKeyName(threadIndex, i);
|
||||||
|
String testNewKey = testKey + ".new";
|
||||||
|
Configuration.addDeprecations(
|
||||||
|
new DeprecationDelta[] {
|
||||||
|
new DeprecationDelta(testKey, testNewKey)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}, 0, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
final AtomicInteger highestAccessThreadId = new AtomicInteger(1);
|
||||||
|
for (int i = 0; i < NUM_THREAD_IDS; i++) {
|
||||||
|
futures.add(executor.schedule(new Callable<Void>() {
|
||||||
|
@Override
|
||||||
|
public Void call() throws Exception {
|
||||||
|
Configuration conf = new Configuration();
|
||||||
|
latch.await();
|
||||||
|
int threadIndex = highestAccessThreadId.addAndGet(1);
|
||||||
|
for (int i = 0; i < NUM_KEYS_PER_THREAD; i++) {
|
||||||
|
String testNewKey = getTestKeyName(threadIndex, i) + ".new";
|
||||||
|
String value = "value." + threadIndex + "." + i;
|
||||||
|
conf.set(testNewKey, value);
|
||||||
|
Assert.assertEquals(value, conf.get(testNewKey));
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}, 0, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
latch.countDown(); // allow all threads to proceed
|
||||||
|
for (Future<Void> future : futures) {
|
||||||
|
Uninterruptibles.getUninterruptibly(future);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
package org.apache.hadoop.hdfs;
|
package org.apache.hadoop.hdfs;
|
||||||
|
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
import org.apache.hadoop.conf.Configuration.DeprecationDelta;
|
||||||
|
|
||||||
import org.apache.hadoop.classification.InterfaceAudience;
|
import org.apache.hadoop.classification.InterfaceAudience;
|
||||||
|
|
||||||
|
|
@ -62,48 +63,83 @@ public class HdfsConfiguration extends Configuration {
|
||||||
public static void init() {
|
public static void init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void deprecate(String oldKey, String newKey) {
|
|
||||||
Configuration.addDeprecation(oldKey, newKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void addDeprecatedKeys() {
|
private static void addDeprecatedKeys() {
|
||||||
deprecate("dfs.backup.address", DFSConfigKeys.DFS_NAMENODE_BACKUP_ADDRESS_KEY);
|
Configuration.addDeprecations(new DeprecationDelta[] {
|
||||||
deprecate("dfs.backup.http.address", DFSConfigKeys.DFS_NAMENODE_BACKUP_HTTP_ADDRESS_KEY);
|
new DeprecationDelta("dfs.backup.address",
|
||||||
deprecate("dfs.balance.bandwidthPerSec", DFSConfigKeys.DFS_DATANODE_BALANCE_BANDWIDTHPERSEC_KEY);
|
DFSConfigKeys.DFS_NAMENODE_BACKUP_ADDRESS_KEY),
|
||||||
deprecate("dfs.data.dir", DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY);
|
new DeprecationDelta("dfs.backup.http.address",
|
||||||
deprecate("dfs.http.address", DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY);
|
DFSConfigKeys.DFS_NAMENODE_BACKUP_HTTP_ADDRESS_KEY),
|
||||||
deprecate("dfs.https.address", DFSConfigKeys.DFS_NAMENODE_HTTPS_ADDRESS_KEY);
|
new DeprecationDelta("dfs.balance.bandwidthPerSec",
|
||||||
deprecate("dfs.max.objects", DFSConfigKeys.DFS_NAMENODE_MAX_OBJECTS_KEY);
|
DFSConfigKeys.DFS_DATANODE_BALANCE_BANDWIDTHPERSEC_KEY),
|
||||||
deprecate("dfs.name.dir", DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY);
|
new DeprecationDelta("dfs.data.dir",
|
||||||
deprecate("dfs.name.dir.restore", DFSConfigKeys.DFS_NAMENODE_NAME_DIR_RESTORE_KEY);
|
DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY),
|
||||||
deprecate("dfs.name.edits.dir", DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY);
|
new DeprecationDelta("dfs.http.address",
|
||||||
deprecate("dfs.read.prefetch.size", DFSConfigKeys.DFS_CLIENT_READ_PREFETCH_SIZE_KEY);
|
DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY),
|
||||||
deprecate("dfs.safemode.extension", DFSConfigKeys.DFS_NAMENODE_SAFEMODE_EXTENSION_KEY);
|
new DeprecationDelta("dfs.https.address",
|
||||||
deprecate("dfs.safemode.threshold.pct", DFSConfigKeys.DFS_NAMENODE_SAFEMODE_THRESHOLD_PCT_KEY);
|
DFSConfigKeys.DFS_NAMENODE_HTTPS_ADDRESS_KEY),
|
||||||
deprecate("dfs.secondary.http.address", DFSConfigKeys.DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_KEY);
|
new DeprecationDelta("dfs.max.objects",
|
||||||
deprecate("dfs.socket.timeout", DFSConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY);
|
DFSConfigKeys.DFS_NAMENODE_MAX_OBJECTS_KEY),
|
||||||
deprecate("fs.checkpoint.dir", DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_DIR_KEY);
|
new DeprecationDelta("dfs.name.dir",
|
||||||
deprecate("fs.checkpoint.edits.dir", DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY);
|
DFSConfigKeys.DFS_NAMENODE_NAME_DIR_KEY),
|
||||||
deprecate("fs.checkpoint.period", DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_PERIOD_KEY);
|
new DeprecationDelta("dfs.name.dir.restore",
|
||||||
deprecate("heartbeat.recheck.interval", DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY);
|
DFSConfigKeys.DFS_NAMENODE_NAME_DIR_RESTORE_KEY),
|
||||||
deprecate("dfs.https.client.keystore.resource", DFSConfigKeys.DFS_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY);
|
new DeprecationDelta("dfs.name.edits.dir",
|
||||||
deprecate("dfs.https.need.client.auth", DFSConfigKeys.DFS_CLIENT_HTTPS_NEED_AUTH_KEY);
|
DFSConfigKeys.DFS_NAMENODE_EDITS_DIR_KEY),
|
||||||
deprecate("slave.host.name", DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY);
|
new DeprecationDelta("dfs.read.prefetch.size",
|
||||||
deprecate("session.id", DFSConfigKeys.DFS_METRICS_SESSION_ID_KEY);
|
DFSConfigKeys.DFS_CLIENT_READ_PREFETCH_SIZE_KEY),
|
||||||
deprecate("dfs.access.time.precision", DFSConfigKeys.DFS_NAMENODE_ACCESSTIME_PRECISION_KEY);
|
new DeprecationDelta("dfs.safemode.extension",
|
||||||
deprecate("dfs.replication.considerLoad", DFSConfigKeys.DFS_NAMENODE_REPLICATION_CONSIDERLOAD_KEY);
|
DFSConfigKeys.DFS_NAMENODE_SAFEMODE_EXTENSION_KEY),
|
||||||
deprecate("dfs.replication.interval", DFSConfigKeys.DFS_NAMENODE_REPLICATION_INTERVAL_KEY);
|
new DeprecationDelta("dfs.safemode.threshold.pct",
|
||||||
deprecate("dfs.replication.min", DFSConfigKeys.DFS_NAMENODE_REPLICATION_MIN_KEY);
|
DFSConfigKeys.DFS_NAMENODE_SAFEMODE_THRESHOLD_PCT_KEY),
|
||||||
deprecate("dfs.replication.pending.timeout.sec", DFSConfigKeys.DFS_NAMENODE_REPLICATION_PENDING_TIMEOUT_SEC_KEY);
|
new DeprecationDelta("dfs.secondary.http.address",
|
||||||
deprecate("dfs.max-repl-streams", DFSConfigKeys.DFS_NAMENODE_REPLICATION_MAX_STREAMS_KEY);
|
DFSConfigKeys.DFS_NAMENODE_SECONDARY_HTTP_ADDRESS_KEY),
|
||||||
deprecate("dfs.permissions", DFSConfigKeys.DFS_PERMISSIONS_ENABLED_KEY);
|
new DeprecationDelta("dfs.socket.timeout",
|
||||||
deprecate("dfs.permissions.supergroup", DFSConfigKeys.DFS_PERMISSIONS_SUPERUSERGROUP_KEY);
|
DFSConfigKeys.DFS_CLIENT_SOCKET_TIMEOUT_KEY),
|
||||||
deprecate("dfs.write.packet.size", DFSConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_KEY);
|
new DeprecationDelta("fs.checkpoint.dir",
|
||||||
deprecate("dfs.block.size", DFSConfigKeys.DFS_BLOCK_SIZE_KEY);
|
DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_DIR_KEY),
|
||||||
deprecate("dfs.datanode.max.xcievers", DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_KEY);
|
new DeprecationDelta("fs.checkpoint.edits.dir",
|
||||||
deprecate("io.bytes.per.checksum", DFSConfigKeys.DFS_BYTES_PER_CHECKSUM_KEY);
|
DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_EDITS_DIR_KEY),
|
||||||
deprecate("dfs.federation.nameservices", DFSConfigKeys.DFS_NAMESERVICES);
|
new DeprecationDelta("fs.checkpoint.period",
|
||||||
deprecate("dfs.federation.nameservice.id", DFSConfigKeys.DFS_NAMESERVICE_ID);
|
DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_PERIOD_KEY),
|
||||||
|
new DeprecationDelta("heartbeat.recheck.interval",
|
||||||
|
DFSConfigKeys.DFS_NAMENODE_HEARTBEAT_RECHECK_INTERVAL_KEY),
|
||||||
|
new DeprecationDelta("dfs.https.client.keystore.resource",
|
||||||
|
DFSConfigKeys.DFS_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY),
|
||||||
|
new DeprecationDelta("dfs.https.need.client.auth",
|
||||||
|
DFSConfigKeys.DFS_CLIENT_HTTPS_NEED_AUTH_KEY),
|
||||||
|
new DeprecationDelta("slave.host.name",
|
||||||
|
DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY),
|
||||||
|
new DeprecationDelta("session.id",
|
||||||
|
DFSConfigKeys.DFS_METRICS_SESSION_ID_KEY),
|
||||||
|
new DeprecationDelta("dfs.access.time.precision",
|
||||||
|
DFSConfigKeys.DFS_NAMENODE_ACCESSTIME_PRECISION_KEY),
|
||||||
|
new DeprecationDelta("dfs.replication.considerLoad",
|
||||||
|
DFSConfigKeys.DFS_NAMENODE_REPLICATION_CONSIDERLOAD_KEY),
|
||||||
|
new DeprecationDelta("dfs.replication.interval",
|
||||||
|
DFSConfigKeys.DFS_NAMENODE_REPLICATION_INTERVAL_KEY),
|
||||||
|
new DeprecationDelta("dfs.replication.min",
|
||||||
|
DFSConfigKeys.DFS_NAMENODE_REPLICATION_MIN_KEY),
|
||||||
|
new DeprecationDelta("dfs.replication.pending.timeout.sec",
|
||||||
|
DFSConfigKeys.DFS_NAMENODE_REPLICATION_PENDING_TIMEOUT_SEC_KEY),
|
||||||
|
new DeprecationDelta("dfs.max-repl-streams",
|
||||||
|
DFSConfigKeys.DFS_NAMENODE_REPLICATION_MAX_STREAMS_KEY),
|
||||||
|
new DeprecationDelta("dfs.permissions",
|
||||||
|
DFSConfigKeys.DFS_PERMISSIONS_ENABLED_KEY),
|
||||||
|
new DeprecationDelta("dfs.permissions.supergroup",
|
||||||
|
DFSConfigKeys.DFS_PERMISSIONS_SUPERUSERGROUP_KEY),
|
||||||
|
new DeprecationDelta("dfs.write.packet.size",
|
||||||
|
DFSConfigKeys.DFS_CLIENT_WRITE_PACKET_SIZE_KEY),
|
||||||
|
new DeprecationDelta("dfs.block.size",
|
||||||
|
DFSConfigKeys.DFS_BLOCK_SIZE_KEY),
|
||||||
|
new DeprecationDelta("dfs.datanode.max.xcievers",
|
||||||
|
DFSConfigKeys.DFS_DATANODE_MAX_RECEIVER_THREADS_KEY),
|
||||||
|
new DeprecationDelta("io.bytes.per.checksum",
|
||||||
|
DFSConfigKeys.DFS_BYTES_PER_CHECKSUM_KEY),
|
||||||
|
new DeprecationDelta("dfs.federation.nameservices",
|
||||||
|
DFSConfigKeys.DFS_NAMESERVICES),
|
||||||
|
new DeprecationDelta("dfs.federation.nameservice.id",
|
||||||
|
DFSConfigKeys.DFS_NAMESERVICE_ID)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ package org.apache.hadoop.mapreduce.util;
|
||||||
import org.apache.hadoop.classification.InterfaceAudience;
|
import org.apache.hadoop.classification.InterfaceAudience;
|
||||||
import org.apache.hadoop.classification.InterfaceStability;
|
import org.apache.hadoop.classification.InterfaceStability;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
import org.apache.hadoop.conf.Configuration.DeprecationDelta;
|
||||||
import org.apache.hadoop.mapreduce.Job;
|
import org.apache.hadoop.mapreduce.Job;
|
||||||
import org.apache.hadoop.mapreduce.MRConfig;
|
import org.apache.hadoop.mapreduce.MRConfig;
|
||||||
import org.apache.hadoop.mapreduce.MRJobConfig;
|
import org.apache.hadoop.mapreduce.MRJobConfig;
|
||||||
|
|
@ -50,487 +51,483 @@ public class ConfigUtil {
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("deprecation")
|
@SuppressWarnings("deprecation")
|
||||||
private static void addDeprecatedKeys() {
|
private static void addDeprecatedKeys() {
|
||||||
Configuration.addDeprecation("mapred.temp.dir",
|
Configuration.addDeprecations(new DeprecationDelta[] {
|
||||||
new String[] {MRConfig.TEMP_DIR});
|
new DeprecationDelta("mapred.temp.dir",
|
||||||
Configuration.addDeprecation("mapred.local.dir",
|
MRConfig.TEMP_DIR),
|
||||||
new String[] {MRConfig.LOCAL_DIR});
|
new DeprecationDelta("mapred.local.dir",
|
||||||
Configuration.addDeprecation("mapred.cluster.map.memory.mb",
|
MRConfig.LOCAL_DIR),
|
||||||
new String[] {MRConfig.MAPMEMORY_MB});
|
new DeprecationDelta("mapred.cluster.map.memory.mb",
|
||||||
Configuration.addDeprecation("mapred.cluster.reduce.memory.mb",
|
MRConfig.MAPMEMORY_MB),
|
||||||
new String[] {MRConfig.REDUCEMEMORY_MB});
|
new DeprecationDelta("mapred.cluster.reduce.memory.mb",
|
||||||
Configuration.addDeprecation("mapred.acls.enabled",
|
MRConfig.REDUCEMEMORY_MB),
|
||||||
new String[] {MRConfig.MR_ACLS_ENABLED});
|
new DeprecationDelta("mapred.acls.enabled",
|
||||||
|
MRConfig.MR_ACLS_ENABLED),
|
||||||
|
|
||||||
Configuration.addDeprecation("mapred.cluster.max.map.memory.mb",
|
new DeprecationDelta("mapred.cluster.max.map.memory.mb",
|
||||||
new String[] {JTConfig.JT_MAX_MAPMEMORY_MB});
|
JTConfig.JT_MAX_MAPMEMORY_MB),
|
||||||
Configuration.addDeprecation("mapred.cluster.max.reduce.memory.mb",
|
new DeprecationDelta("mapred.cluster.max.reduce.memory.mb",
|
||||||
new String[] {JTConfig.JT_MAX_REDUCEMEMORY_MB});
|
JTConfig.JT_MAX_REDUCEMEMORY_MB),
|
||||||
|
|
||||||
Configuration.addDeprecation("mapred.cluster.average.blacklist.threshold",
|
new DeprecationDelta("mapred.cluster.average.blacklist.threshold",
|
||||||
new String[] {JTConfig.JT_AVG_BLACKLIST_THRESHOLD});
|
JTConfig.JT_AVG_BLACKLIST_THRESHOLD),
|
||||||
Configuration.addDeprecation("hadoop.job.history.location",
|
new DeprecationDelta("hadoop.job.history.location",
|
||||||
new String[] {JTConfig.JT_JOBHISTORY_LOCATION});
|
JTConfig.JT_JOBHISTORY_LOCATION),
|
||||||
Configuration.addDeprecation(
|
new DeprecationDelta(
|
||||||
"mapred.job.tracker.history.completed.location",
|
"mapred.job.tracker.history.completed.location",
|
||||||
new String[] {JTConfig.JT_JOBHISTORY_COMPLETED_LOCATION});
|
JTConfig.JT_JOBHISTORY_COMPLETED_LOCATION),
|
||||||
Configuration.addDeprecation("mapred.jobtracker.job.history.block.size",
|
new DeprecationDelta("mapred.jobtracker.job.history.block.size",
|
||||||
new String[] {JTConfig.JT_JOBHISTORY_BLOCK_SIZE});
|
JTConfig.JT_JOBHISTORY_BLOCK_SIZE),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.jobhistory.lru.cache.size",
|
new DeprecationDelta("mapred.job.tracker.jobhistory.lru.cache.size",
|
||||||
new String[] {JTConfig.JT_JOBHISTORY_CACHE_SIZE});
|
JTConfig.JT_JOBHISTORY_CACHE_SIZE),
|
||||||
Configuration.addDeprecation("mapred.hosts",
|
new DeprecationDelta("mapred.hosts",
|
||||||
new String[] {JTConfig.JT_HOSTS_FILENAME});
|
JTConfig.JT_HOSTS_FILENAME),
|
||||||
Configuration.addDeprecation("mapred.hosts.exclude",
|
new DeprecationDelta("mapred.hosts.exclude",
|
||||||
new String[] {JTConfig.JT_HOSTS_EXCLUDE_FILENAME});
|
JTConfig.JT_HOSTS_EXCLUDE_FILENAME),
|
||||||
Configuration.addDeprecation("mapred.system.dir",
|
new DeprecationDelta("mapred.system.dir",
|
||||||
new String[] {JTConfig.JT_SYSTEM_DIR});
|
JTConfig.JT_SYSTEM_DIR),
|
||||||
Configuration.addDeprecation("mapred.max.tracker.blacklists",
|
new DeprecationDelta("mapred.max.tracker.blacklists",
|
||||||
new String[] {JTConfig.JT_MAX_TRACKER_BLACKLISTS});
|
JTConfig.JT_MAX_TRACKER_BLACKLISTS),
|
||||||
Configuration.addDeprecation("mapred.job.tracker",
|
new DeprecationDelta("mapred.job.tracker",
|
||||||
new String[] {JTConfig.JT_IPC_ADDRESS});
|
JTConfig.JT_IPC_ADDRESS),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.http.address",
|
new DeprecationDelta("mapred.job.tracker.http.address",
|
||||||
new String[] {JTConfig.JT_HTTP_ADDRESS});
|
JTConfig.JT_HTTP_ADDRESS),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.handler.count",
|
new DeprecationDelta("mapred.job.tracker.handler.count",
|
||||||
new String[] {JTConfig.JT_IPC_HANDLER_COUNT});
|
JTConfig.JT_IPC_HANDLER_COUNT),
|
||||||
Configuration.addDeprecation("mapred.jobtracker.restart.recover",
|
new DeprecationDelta("mapred.jobtracker.restart.recover",
|
||||||
new String[] {JTConfig.JT_RESTART_ENABLED});
|
JTConfig.JT_RESTART_ENABLED),
|
||||||
Configuration.addDeprecation("mapred.jobtracker.taskScheduler",
|
new DeprecationDelta("mapred.jobtracker.taskScheduler",
|
||||||
new String[] {JTConfig.JT_TASK_SCHEDULER});
|
JTConfig.JT_TASK_SCHEDULER),
|
||||||
Configuration.addDeprecation(
|
new DeprecationDelta(
|
||||||
"mapred.jobtracker.taskScheduler.maxRunningTasksPerJob",
|
"mapred.jobtracker.taskScheduler.maxRunningTasksPerJob",
|
||||||
new String[] {JTConfig.JT_RUNNINGTASKS_PER_JOB});
|
JTConfig.JT_RUNNINGTASKS_PER_JOB),
|
||||||
Configuration.addDeprecation("mapred.jobtracker.instrumentation",
|
new DeprecationDelta("mapred.jobtracker.instrumentation",
|
||||||
new String[] {JTConfig.JT_INSTRUMENTATION});
|
JTConfig.JT_INSTRUMENTATION),
|
||||||
Configuration.addDeprecation("mapred.jobtracker.maxtasks.per.job",
|
new DeprecationDelta("mapred.jobtracker.maxtasks.per.job",
|
||||||
new String[] {JTConfig.JT_TASKS_PER_JOB});
|
JTConfig.JT_TASKS_PER_JOB),
|
||||||
Configuration.addDeprecation("mapred.heartbeats.in.second",
|
new DeprecationDelta("mapred.heartbeats.in.second",
|
||||||
new String[] {JTConfig.JT_HEARTBEATS_IN_SECOND});
|
JTConfig.JT_HEARTBEATS_IN_SECOND),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.persist.jobstatus.active",
|
new DeprecationDelta("mapred.job.tracker.persist.jobstatus.active",
|
||||||
new String[] {JTConfig.JT_PERSIST_JOBSTATUS});
|
JTConfig.JT_PERSIST_JOBSTATUS),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.persist.jobstatus.hours",
|
new DeprecationDelta("mapred.job.tracker.persist.jobstatus.hours",
|
||||||
new String[] {JTConfig.JT_PERSIST_JOBSTATUS_HOURS});
|
JTConfig.JT_PERSIST_JOBSTATUS_HOURS),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.persist.jobstatus.dir",
|
new DeprecationDelta("mapred.job.tracker.persist.jobstatus.dir",
|
||||||
new String[] {JTConfig.JT_PERSIST_JOBSTATUS_DIR});
|
JTConfig.JT_PERSIST_JOBSTATUS_DIR),
|
||||||
Configuration.addDeprecation("mapred.permissions.supergroup",
|
new DeprecationDelta("mapred.permissions.supergroup",
|
||||||
new String[] {MRConfig.MR_SUPERGROUP});
|
MRConfig.MR_SUPERGROUP),
|
||||||
Configuration.addDeprecation("mapreduce.jobtracker.permissions.supergroup",
|
new DeprecationDelta("mapreduce.jobtracker.permissions.supergroup",
|
||||||
new String[] {MRConfig.MR_SUPERGROUP});
|
MRConfig.MR_SUPERGROUP),
|
||||||
Configuration.addDeprecation("mapred.task.cache.levels",
|
new DeprecationDelta("mapred.task.cache.levels",
|
||||||
new String[] {JTConfig.JT_TASKCACHE_LEVELS});
|
JTConfig.JT_TASKCACHE_LEVELS),
|
||||||
Configuration.addDeprecation("mapred.jobtracker.taskalloc.capacitypad",
|
new DeprecationDelta("mapred.jobtracker.taskalloc.capacitypad",
|
||||||
new String[] {JTConfig.JT_TASK_ALLOC_PAD_FRACTION});
|
JTConfig.JT_TASK_ALLOC_PAD_FRACTION),
|
||||||
Configuration.addDeprecation("mapred.jobinit.threads",
|
new DeprecationDelta("mapred.jobinit.threads",
|
||||||
new String[] {JTConfig.JT_JOBINIT_THREADS});
|
JTConfig.JT_JOBINIT_THREADS),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.expiry.interval",
|
new DeprecationDelta("mapred.tasktracker.expiry.interval",
|
||||||
new String[] {JTConfig.JT_TRACKER_EXPIRY_INTERVAL});
|
JTConfig.JT_TRACKER_EXPIRY_INTERVAL),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.retiredjobs.cache.size",
|
new DeprecationDelta("mapred.job.tracker.retiredjobs.cache.size",
|
||||||
new String[] {JTConfig.JT_RETIREJOB_CACHE_SIZE});
|
JTConfig.JT_RETIREJOB_CACHE_SIZE),
|
||||||
Configuration.addDeprecation("mapred.job.tracker.retire.jobs",
|
new DeprecationDelta("mapred.job.tracker.retire.jobs",
|
||||||
new String[] {JTConfig.JT_RETIREJOBS});
|
JTConfig.JT_RETIREJOBS),
|
||||||
Configuration.addDeprecation("mapred.healthChecker.interval",
|
new DeprecationDelta("mapred.healthChecker.interval",
|
||||||
new String[] {TTConfig.TT_HEALTH_CHECKER_INTERVAL});
|
TTConfig.TT_HEALTH_CHECKER_INTERVAL),
|
||||||
Configuration.addDeprecation("mapred.healthChecker.script.args",
|
new DeprecationDelta("mapred.healthChecker.script.args",
|
||||||
new String[] {TTConfig.TT_HEALTH_CHECKER_SCRIPT_ARGS});
|
TTConfig.TT_HEALTH_CHECKER_SCRIPT_ARGS),
|
||||||
Configuration.addDeprecation("mapred.healthChecker.script.path",
|
new DeprecationDelta("mapred.healthChecker.script.path",
|
||||||
new String[] {TTConfig.TT_HEALTH_CHECKER_SCRIPT_PATH});
|
TTConfig.TT_HEALTH_CHECKER_SCRIPT_PATH),
|
||||||
Configuration.addDeprecation("mapred.healthChecker.script.timeout",
|
new DeprecationDelta("mapred.healthChecker.script.timeout",
|
||||||
new String[] {TTConfig.TT_HEALTH_CHECKER_SCRIPT_TIMEOUT});
|
TTConfig.TT_HEALTH_CHECKER_SCRIPT_TIMEOUT),
|
||||||
Configuration.addDeprecation("mapred.local.dir.minspacekill",
|
new DeprecationDelta("mapred.local.dir.minspacekill",
|
||||||
new String[] {TTConfig.TT_LOCAL_DIR_MINSPACE_KILL});
|
TTConfig.TT_LOCAL_DIR_MINSPACE_KILL),
|
||||||
Configuration.addDeprecation("mapred.local.dir.minspacestart",
|
new DeprecationDelta("mapred.local.dir.minspacestart",
|
||||||
new String[] {TTConfig.TT_LOCAL_DIR_MINSPACE_START});
|
TTConfig.TT_LOCAL_DIR_MINSPACE_START),
|
||||||
Configuration.addDeprecation("mapred.task.tracker.http.address",
|
new DeprecationDelta("mapred.task.tracker.http.address",
|
||||||
new String[] {TTConfig.TT_HTTP_ADDRESS});
|
TTConfig.TT_HTTP_ADDRESS),
|
||||||
Configuration.addDeprecation("mapred.task.tracker.report.address",
|
new DeprecationDelta("mapred.task.tracker.report.address",
|
||||||
new String[] {TTConfig.TT_REPORT_ADDRESS});
|
TTConfig.TT_REPORT_ADDRESS),
|
||||||
Configuration.addDeprecation("mapred.task.tracker.task-controller",
|
new DeprecationDelta("mapred.task.tracker.task-controller",
|
||||||
new String[] {TTConfig.TT_TASK_CONTROLLER});
|
TTConfig.TT_TASK_CONTROLLER),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.dns.interface",
|
new DeprecationDelta("mapred.tasktracker.dns.interface",
|
||||||
new String[] {TTConfig.TT_DNS_INTERFACE});
|
TTConfig.TT_DNS_INTERFACE),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.dns.nameserver",
|
new DeprecationDelta("mapred.tasktracker.dns.nameserver",
|
||||||
new String[] {TTConfig.TT_DNS_NAMESERVER});
|
TTConfig.TT_DNS_NAMESERVER),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.events.batchsize",
|
new DeprecationDelta("mapred.tasktracker.events.batchsize",
|
||||||
new String[] {TTConfig.TT_MAX_TASK_COMPLETION_EVENTS_TO_POLL});
|
TTConfig.TT_MAX_TASK_COMPLETION_EVENTS_TO_POLL),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.indexcache.mb",
|
new DeprecationDelta("mapred.tasktracker.indexcache.mb",
|
||||||
new String[] {TTConfig.TT_INDEX_CACHE});
|
TTConfig.TT_INDEX_CACHE),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.instrumentation",
|
new DeprecationDelta("mapred.tasktracker.instrumentation",
|
||||||
new String[] {TTConfig.TT_INSTRUMENTATION});
|
TTConfig.TT_INSTRUMENTATION),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.map.tasks.maximum",
|
new DeprecationDelta("mapred.tasktracker.map.tasks.maximum",
|
||||||
new String[] {TTConfig.TT_MAP_SLOTS});
|
TTConfig.TT_MAP_SLOTS),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.memory_calculator_plugin",
|
new DeprecationDelta("mapred.tasktracker.memory_calculator_plugin",
|
||||||
new String[] {TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN});
|
TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.memorycalculatorplugin",
|
new DeprecationDelta("mapred.tasktracker.memorycalculatorplugin",
|
||||||
new String[] {TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN});
|
TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN),
|
||||||
Configuration.addDeprecation("mapred.tasktracker.reduce.tasks.maximum",
|
new DeprecationDelta("mapred.tasktracker.reduce.tasks.maximum",
|
||||||
new String[] {TTConfig.TT_REDUCE_SLOTS});
|
TTConfig.TT_REDUCE_SLOTS),
|
||||||
Configuration.addDeprecation(
|
new DeprecationDelta(
|
||||||
"mapred.tasktracker.taskmemorymanager.monitoring-interval",
|
"mapred.tasktracker.taskmemorymanager.monitoring-interval",
|
||||||
new String[] {TTConfig.TT_MEMORY_MANAGER_MONITORING_INTERVAL});
|
TTConfig.TT_MEMORY_MANAGER_MONITORING_INTERVAL),
|
||||||
Configuration.addDeprecation(
|
new DeprecationDelta(
|
||||||
"mapred.tasktracker.tasks.sleeptime-before-sigkill",
|
"mapred.tasktracker.tasks.sleeptime-before-sigkill",
|
||||||
new String[] {TTConfig.TT_SLEEP_TIME_BEFORE_SIG_KILL});
|
TTConfig.TT_SLEEP_TIME_BEFORE_SIG_KILL),
|
||||||
Configuration.addDeprecation("slave.host.name",
|
new DeprecationDelta("slave.host.name",
|
||||||
new String[] {TTConfig.TT_HOST_NAME});
|
TTConfig.TT_HOST_NAME),
|
||||||
Configuration.addDeprecation("tasktracker.http.threads",
|
new DeprecationDelta("tasktracker.http.threads",
|
||||||
new String[] {TTConfig.TT_HTTP_THREADS});
|
TTConfig.TT_HTTP_THREADS),
|
||||||
Configuration.addDeprecation("hadoop.net.static.resolutions",
|
new DeprecationDelta("hadoop.net.static.resolutions",
|
||||||
new String[] {TTConfig.TT_STATIC_RESOLUTIONS});
|
TTConfig.TT_STATIC_RESOLUTIONS),
|
||||||
Configuration.addDeprecation("local.cache.size",
|
new DeprecationDelta("local.cache.size",
|
||||||
new String[] {TTConfig.TT_LOCAL_CACHE_SIZE});
|
TTConfig.TT_LOCAL_CACHE_SIZE),
|
||||||
Configuration.addDeprecation("tasktracker.contention.tracking",
|
new DeprecationDelta("tasktracker.contention.tracking",
|
||||||
new String[] {TTConfig.TT_CONTENTION_TRACKING});
|
TTConfig.TT_CONTENTION_TRACKING),
|
||||||
Configuration.addDeprecation("job.end.notification.url",
|
new DeprecationDelta("job.end.notification.url",
|
||||||
new String[] {MRJobConfig.MR_JOB_END_NOTIFICATION_URL});
|
MRJobConfig.MR_JOB_END_NOTIFICATION_URL),
|
||||||
Configuration.addDeprecation("job.end.retry.attempts",
|
new DeprecationDelta("job.end.retry.attempts",
|
||||||
new String[] {MRJobConfig.MR_JOB_END_RETRY_ATTEMPTS});
|
MRJobConfig.MR_JOB_END_RETRY_ATTEMPTS),
|
||||||
Configuration.addDeprecation("job.end.retry.interval",
|
new DeprecationDelta("job.end.retry.interval",
|
||||||
new String[] {MRJobConfig.MR_JOB_END_RETRY_INTERVAL});
|
MRJobConfig.MR_JOB_END_RETRY_INTERVAL),
|
||||||
Configuration.addDeprecation("mapred.committer.job.setup.cleanup.needed",
|
new DeprecationDelta("mapred.committer.job.setup.cleanup.needed",
|
||||||
new String[] {MRJobConfig.SETUP_CLEANUP_NEEDED});
|
MRJobConfig.SETUP_CLEANUP_NEEDED),
|
||||||
Configuration.addDeprecation("mapred.jar",
|
new DeprecationDelta("mapred.jar",
|
||||||
new String[] {MRJobConfig.JAR});
|
MRJobConfig.JAR),
|
||||||
Configuration.addDeprecation("mapred.job.id",
|
new DeprecationDelta("mapred.job.id",
|
||||||
new String[] {MRJobConfig.ID});
|
MRJobConfig.ID),
|
||||||
Configuration.addDeprecation("mapred.job.name",
|
new DeprecationDelta("mapred.job.name",
|
||||||
new String[] {MRJobConfig.JOB_NAME});
|
MRJobConfig.JOB_NAME),
|
||||||
Configuration.addDeprecation("mapred.job.priority",
|
new DeprecationDelta("mapred.job.priority",
|
||||||
new String[] {MRJobConfig.PRIORITY});
|
MRJobConfig.PRIORITY),
|
||||||
Configuration.addDeprecation("mapred.job.queue.name",
|
new DeprecationDelta("mapred.job.queue.name",
|
||||||
new String[] {MRJobConfig.QUEUE_NAME});
|
MRJobConfig.QUEUE_NAME),
|
||||||
Configuration.addDeprecation("mapred.job.reuse.jvm.num.tasks",
|
new DeprecationDelta("mapred.job.reuse.jvm.num.tasks",
|
||||||
new String[] {MRJobConfig.JVM_NUMTASKS_TORUN});
|
MRJobConfig.JVM_NUMTASKS_TORUN),
|
||||||
Configuration.addDeprecation("mapred.map.tasks",
|
new DeprecationDelta("mapred.map.tasks",
|
||||||
new String[] {MRJobConfig.NUM_MAPS});
|
MRJobConfig.NUM_MAPS),
|
||||||
Configuration.addDeprecation("mapred.max.tracker.failures",
|
new DeprecationDelta("mapred.max.tracker.failures",
|
||||||
new String[] {MRJobConfig.MAX_TASK_FAILURES_PER_TRACKER});
|
MRJobConfig.MAX_TASK_FAILURES_PER_TRACKER),
|
||||||
Configuration.addDeprecation("mapred.reduce.slowstart.completed.maps",
|
new DeprecationDelta("mapred.reduce.slowstart.completed.maps",
|
||||||
new String[] {MRJobConfig.COMPLETED_MAPS_FOR_REDUCE_SLOWSTART});
|
MRJobConfig.COMPLETED_MAPS_FOR_REDUCE_SLOWSTART),
|
||||||
Configuration.addDeprecation("mapred.reduce.tasks",
|
new DeprecationDelta("mapred.reduce.tasks",
|
||||||
new String[] {MRJobConfig.NUM_REDUCES});
|
MRJobConfig.NUM_REDUCES),
|
||||||
Configuration.addDeprecation("mapred.skip.on",
|
new DeprecationDelta("mapred.skip.on",
|
||||||
new String[] {MRJobConfig.SKIP_RECORDS});
|
MRJobConfig.SKIP_RECORDS),
|
||||||
Configuration.addDeprecation("mapred.skip.out.dir",
|
new DeprecationDelta("mapred.skip.out.dir",
|
||||||
new String[] {MRJobConfig.SKIP_OUTDIR});
|
MRJobConfig.SKIP_OUTDIR),
|
||||||
Configuration.addDeprecation(
|
new DeprecationDelta("mapred.speculative.execution.slowNodeThreshold",
|
||||||
"mapred.speculative.execution.slowNodeThreshold",
|
MRJobConfig.SPECULATIVE_SLOWNODE_THRESHOLD),
|
||||||
new String[] {MRJobConfig.SPECULATIVE_SLOWNODE_THRESHOLD});
|
new DeprecationDelta("mapred.speculative.execution.slowTaskThreshold",
|
||||||
Configuration.addDeprecation(
|
MRJobConfig.SPECULATIVE_SLOWTASK_THRESHOLD),
|
||||||
"mapred.speculative.execution.slowTaskThreshold",
|
new DeprecationDelta("mapred.speculative.execution.speculativeCap",
|
||||||
new String[] {MRJobConfig.SPECULATIVE_SLOWTASK_THRESHOLD});
|
MRJobConfig.SPECULATIVECAP),
|
||||||
Configuration.addDeprecation("mapred.speculative.execution.speculativeCap",
|
new DeprecationDelta("job.local.dir",
|
||||||
new String[] {MRJobConfig.SPECULATIVECAP});
|
MRJobConfig.JOB_LOCAL_DIR),
|
||||||
Configuration.addDeprecation("job.local.dir",
|
new DeprecationDelta("mapreduce.inputformat.class",
|
||||||
new String[] {MRJobConfig.JOB_LOCAL_DIR});
|
MRJobConfig.INPUT_FORMAT_CLASS_ATTR),
|
||||||
Configuration.addDeprecation("mapreduce.inputformat.class",
|
new DeprecationDelta("mapreduce.map.class",
|
||||||
new String[] {MRJobConfig.INPUT_FORMAT_CLASS_ATTR});
|
MRJobConfig.MAP_CLASS_ATTR),
|
||||||
Configuration.addDeprecation("mapreduce.map.class",
|
new DeprecationDelta("mapreduce.combine.class",
|
||||||
new String[] {MRJobConfig.MAP_CLASS_ATTR});
|
MRJobConfig.COMBINE_CLASS_ATTR),
|
||||||
Configuration.addDeprecation("mapreduce.combine.class",
|
new DeprecationDelta("mapreduce.reduce.class",
|
||||||
new String[] {MRJobConfig.COMBINE_CLASS_ATTR});
|
MRJobConfig.REDUCE_CLASS_ATTR),
|
||||||
Configuration.addDeprecation("mapreduce.reduce.class",
|
new DeprecationDelta("mapreduce.outputformat.class",
|
||||||
new String[] {MRJobConfig.REDUCE_CLASS_ATTR});
|
MRJobConfig.OUTPUT_FORMAT_CLASS_ATTR),
|
||||||
Configuration.addDeprecation("mapreduce.outputformat.class",
|
new DeprecationDelta("mapreduce.partitioner.class",
|
||||||
new String[] {MRJobConfig.OUTPUT_FORMAT_CLASS_ATTR});
|
MRJobConfig.PARTITIONER_CLASS_ATTR),
|
||||||
Configuration.addDeprecation("mapreduce.partitioner.class",
|
new DeprecationDelta("mapred.job.classpath.archives",
|
||||||
new String[] {MRJobConfig.PARTITIONER_CLASS_ATTR});
|
MRJobConfig.CLASSPATH_ARCHIVES),
|
||||||
Configuration.addDeprecation("mapred.job.classpath.archives",
|
new DeprecationDelta("mapred.job.classpath.files",
|
||||||
new String[] {MRJobConfig.CLASSPATH_ARCHIVES});
|
MRJobConfig.CLASSPATH_FILES),
|
||||||
Configuration.addDeprecation("mapred.job.classpath.files",
|
new DeprecationDelta("mapred.cache.files",
|
||||||
new String[] {MRJobConfig.CLASSPATH_FILES});
|
MRJobConfig.CACHE_FILES),
|
||||||
Configuration.addDeprecation("mapred.cache.files",
|
new DeprecationDelta("mapred.cache.archives",
|
||||||
new String[] {MRJobConfig.CACHE_FILES});
|
MRJobConfig.CACHE_ARCHIVES),
|
||||||
Configuration.addDeprecation("mapred.cache.archives",
|
new DeprecationDelta("mapred.cache.localFiles",
|
||||||
new String[] {MRJobConfig.CACHE_ARCHIVES});
|
MRJobConfig.CACHE_LOCALFILES),
|
||||||
Configuration.addDeprecation("mapred.cache.localFiles",
|
new DeprecationDelta("mapred.cache.localArchives",
|
||||||
new String[] {MRJobConfig.CACHE_LOCALFILES});
|
MRJobConfig.CACHE_LOCALARCHIVES),
|
||||||
Configuration.addDeprecation("mapred.cache.localArchives",
|
new DeprecationDelta("mapred.cache.files.filesizes",
|
||||||
new String[] {MRJobConfig.CACHE_LOCALARCHIVES});
|
MRJobConfig.CACHE_FILES_SIZES),
|
||||||
Configuration.addDeprecation("mapred.cache.files.filesizes",
|
new DeprecationDelta("mapred.cache.archives.filesizes",
|
||||||
new String[] {MRJobConfig.CACHE_FILES_SIZES});
|
MRJobConfig.CACHE_ARCHIVES_SIZES),
|
||||||
Configuration.addDeprecation("mapred.cache.archives.filesizes",
|
new DeprecationDelta("mapred.cache.files.timestamps",
|
||||||
new String[] {MRJobConfig.CACHE_ARCHIVES_SIZES});
|
MRJobConfig.CACHE_FILE_TIMESTAMPS),
|
||||||
Configuration.addDeprecation("mapred.cache.files.timestamps",
|
new DeprecationDelta("mapred.cache.archives.timestamps",
|
||||||
new String[] {MRJobConfig.CACHE_FILE_TIMESTAMPS});
|
MRJobConfig.CACHE_ARCHIVES_TIMESTAMPS),
|
||||||
Configuration.addDeprecation("mapred.cache.archives.timestamps",
|
new DeprecationDelta("mapred.working.dir",
|
||||||
new String[] {MRJobConfig.CACHE_ARCHIVES_TIMESTAMPS});
|
MRJobConfig.WORKING_DIR),
|
||||||
Configuration.addDeprecation("mapred.working.dir",
|
new DeprecationDelta("user.name",
|
||||||
new String[] {MRJobConfig.WORKING_DIR});
|
MRJobConfig.USER_NAME),
|
||||||
Configuration.addDeprecation("user.name",
|
new DeprecationDelta("mapred.output.key.class",
|
||||||
new String[] {MRJobConfig.USER_NAME});
|
MRJobConfig.OUTPUT_KEY_CLASS),
|
||||||
Configuration.addDeprecation("mapred.output.key.class",
|
new DeprecationDelta("mapred.output.value.class",
|
||||||
new String[] {MRJobConfig.OUTPUT_KEY_CLASS});
|
MRJobConfig.OUTPUT_VALUE_CLASS),
|
||||||
Configuration.addDeprecation("mapred.output.value.class",
|
new DeprecationDelta("mapred.output.value.groupfn.class",
|
||||||
new String[] {MRJobConfig.OUTPUT_VALUE_CLASS});
|
MRJobConfig.GROUP_COMPARATOR_CLASS),
|
||||||
Configuration.addDeprecation("mapred.output.value.groupfn.class",
|
new DeprecationDelta("mapred.output.key.comparator.class",
|
||||||
new String[] {MRJobConfig.GROUP_COMPARATOR_CLASS});
|
MRJobConfig.KEY_COMPARATOR),
|
||||||
Configuration.addDeprecation("mapred.output.key.comparator.class",
|
new DeprecationDelta("io.sort.factor",
|
||||||
new String[] {MRJobConfig.KEY_COMPARATOR});
|
MRJobConfig.IO_SORT_FACTOR),
|
||||||
Configuration.addDeprecation("io.sort.factor",
|
new DeprecationDelta("io.sort.mb",
|
||||||
new String[] {MRJobConfig.IO_SORT_FACTOR});
|
MRJobConfig.IO_SORT_MB),
|
||||||
Configuration.addDeprecation("io.sort.mb",
|
new DeprecationDelta("keep.failed.task.files",
|
||||||
new String[] {MRJobConfig.IO_SORT_MB});
|
MRJobConfig.PRESERVE_FAILED_TASK_FILES),
|
||||||
Configuration.addDeprecation("keep.failed.task.files",
|
new DeprecationDelta("keep.task.files.pattern",
|
||||||
new String[] {MRJobConfig.PRESERVE_FAILED_TASK_FILES});
|
MRJobConfig.PRESERVE_FILES_PATTERN),
|
||||||
Configuration.addDeprecation("keep.task.files.pattern",
|
new DeprecationDelta("mapred.child.tmp",
|
||||||
new String[] {MRJobConfig.PRESERVE_FILES_PATTERN});
|
MRJobConfig.TASK_TEMP_DIR),
|
||||||
Configuration.addDeprecation("mapred.child.tmp",
|
new DeprecationDelta("mapred.debug.out.lines",
|
||||||
new String[] {MRJobConfig.TASK_TEMP_DIR});
|
MRJobConfig.TASK_DEBUGOUT_LINES),
|
||||||
Configuration.addDeprecation("mapred.debug.out.lines",
|
new DeprecationDelta("mapred.merge.recordsBeforeProgress",
|
||||||
new String[] {MRJobConfig.TASK_DEBUGOUT_LINES});
|
MRJobConfig.RECORDS_BEFORE_PROGRESS),
|
||||||
Configuration.addDeprecation("mapred.merge.recordsBeforeProgress",
|
new DeprecationDelta("mapred.skip.attempts.to.start.skipping",
|
||||||
new String[] {MRJobConfig.RECORDS_BEFORE_PROGRESS});
|
MRJobConfig.SKIP_START_ATTEMPTS),
|
||||||
Configuration.addDeprecation("mapred.skip.attempts.to.start.skipping",
|
new DeprecationDelta("mapred.task.id",
|
||||||
new String[] {MRJobConfig.SKIP_START_ATTEMPTS});
|
MRJobConfig.TASK_ATTEMPT_ID),
|
||||||
Configuration.addDeprecation("mapred.task.id",
|
new DeprecationDelta("mapred.task.is.map",
|
||||||
new String[] {MRJobConfig.TASK_ATTEMPT_ID});
|
MRJobConfig.TASK_ISMAP),
|
||||||
Configuration.addDeprecation("mapred.task.is.map",
|
new DeprecationDelta("mapred.task.partition",
|
||||||
new String[] {MRJobConfig.TASK_ISMAP});
|
MRJobConfig.TASK_PARTITION),
|
||||||
Configuration.addDeprecation("mapred.task.partition",
|
new DeprecationDelta("mapred.task.profile",
|
||||||
new String[] {MRJobConfig.TASK_PARTITION});
|
MRJobConfig.TASK_PROFILE),
|
||||||
Configuration.addDeprecation("mapred.task.profile",
|
new DeprecationDelta("mapred.task.profile.maps",
|
||||||
new String[] {MRJobConfig.TASK_PROFILE});
|
MRJobConfig.NUM_MAP_PROFILES),
|
||||||
Configuration.addDeprecation("mapred.task.profile.maps",
|
new DeprecationDelta("mapred.task.profile.reduces",
|
||||||
new String[] {MRJobConfig.NUM_MAP_PROFILES});
|
MRJobConfig.NUM_REDUCE_PROFILES),
|
||||||
Configuration.addDeprecation("mapred.task.profile.reduces",
|
new DeprecationDelta("mapred.task.timeout",
|
||||||
new String[] {MRJobConfig.NUM_REDUCE_PROFILES});
|
MRJobConfig.TASK_TIMEOUT),
|
||||||
Configuration.addDeprecation("mapred.task.timeout",
|
new DeprecationDelta("mapred.tip.id",
|
||||||
new String[] {MRJobConfig.TASK_TIMEOUT});
|
MRJobConfig.TASK_ID),
|
||||||
Configuration.addDeprecation("mapred.tip.id",
|
new DeprecationDelta("mapred.work.output.dir",
|
||||||
new String[] {MRJobConfig.TASK_ID});
|
MRJobConfig.TASK_OUTPUT_DIR),
|
||||||
Configuration.addDeprecation("mapred.work.output.dir",
|
new DeprecationDelta("mapred.userlog.limit.kb",
|
||||||
new String[] {MRJobConfig.TASK_OUTPUT_DIR});
|
MRJobConfig.TASK_USERLOG_LIMIT),
|
||||||
Configuration.addDeprecation("mapred.userlog.limit.kb",
|
new DeprecationDelta("mapred.userlog.retain.hours",
|
||||||
new String[] {MRJobConfig.TASK_USERLOG_LIMIT});
|
MRJobConfig.USER_LOG_RETAIN_HOURS),
|
||||||
Configuration.addDeprecation("mapred.userlog.retain.hours",
|
new DeprecationDelta("mapred.task.profile.params",
|
||||||
new String[] {MRJobConfig.USER_LOG_RETAIN_HOURS});
|
MRJobConfig.TASK_PROFILE_PARAMS),
|
||||||
Configuration.addDeprecation("mapred.task.profile.params",
|
new DeprecationDelta("io.sort.spill.percent",
|
||||||
new String[] {MRJobConfig.TASK_PROFILE_PARAMS});
|
MRJobConfig.MAP_SORT_SPILL_PERCENT),
|
||||||
Configuration.addDeprecation("io.sort.spill.percent",
|
new DeprecationDelta("map.input.file",
|
||||||
new String[] {MRJobConfig.MAP_SORT_SPILL_PERCENT});
|
MRJobConfig.MAP_INPUT_FILE),
|
||||||
Configuration.addDeprecation("map.input.file",
|
new DeprecationDelta("map.input.length",
|
||||||
new String[] {MRJobConfig.MAP_INPUT_FILE});
|
MRJobConfig.MAP_INPUT_PATH),
|
||||||
Configuration.addDeprecation("map.input.length",
|
new DeprecationDelta("map.input.start",
|
||||||
new String[] {MRJobConfig.MAP_INPUT_PATH});
|
MRJobConfig.MAP_INPUT_START),
|
||||||
Configuration.addDeprecation("map.input.start",
|
new DeprecationDelta("mapred.job.map.memory.mb",
|
||||||
new String[] {MRJobConfig.MAP_INPUT_START});
|
MRJobConfig.MAP_MEMORY_MB),
|
||||||
Configuration.addDeprecation("mapred.job.map.memory.mb",
|
new DeprecationDelta("mapred.map.child.env",
|
||||||
new String[] {MRJobConfig.MAP_MEMORY_MB});
|
MRJobConfig.MAP_ENV),
|
||||||
Configuration.addDeprecation("mapred.map.child.env",
|
new DeprecationDelta("mapred.map.child.java.opts",
|
||||||
new String[] {MRJobConfig.MAP_ENV});
|
MRJobConfig.MAP_JAVA_OPTS),
|
||||||
Configuration.addDeprecation("mapred.map.child.java.opts",
|
new DeprecationDelta("mapred.map.max.attempts",
|
||||||
new String[] {MRJobConfig.MAP_JAVA_OPTS});
|
MRJobConfig.MAP_MAX_ATTEMPTS),
|
||||||
Configuration.addDeprecation("mapred.map.max.attempts",
|
new DeprecationDelta("mapred.map.task.debug.script",
|
||||||
new String[] {MRJobConfig.MAP_MAX_ATTEMPTS});
|
MRJobConfig.MAP_DEBUG_SCRIPT),
|
||||||
Configuration.addDeprecation("mapred.map.task.debug.script",
|
new DeprecationDelta("mapred.map.tasks.speculative.execution",
|
||||||
new String[] {MRJobConfig.MAP_DEBUG_SCRIPT});
|
MRJobConfig.MAP_SPECULATIVE),
|
||||||
Configuration.addDeprecation("mapred.map.tasks.speculative.execution",
|
new DeprecationDelta("mapred.max.map.failures.percent",
|
||||||
new String[] {MRJobConfig.MAP_SPECULATIVE});
|
MRJobConfig.MAP_FAILURES_MAX_PERCENT),
|
||||||
Configuration.addDeprecation("mapred.max.map.failures.percent",
|
new DeprecationDelta("mapred.skip.map.auto.incr.proc.count",
|
||||||
new String[] {MRJobConfig.MAP_FAILURES_MAX_PERCENT});
|
MRJobConfig.MAP_SKIP_INCR_PROC_COUNT),
|
||||||
Configuration.addDeprecation("mapred.skip.map.auto.incr.proc.count",
|
new DeprecationDelta("mapred.skip.map.max.skip.records",
|
||||||
new String[] {MRJobConfig.MAP_SKIP_INCR_PROC_COUNT});
|
MRJobConfig.MAP_SKIP_MAX_RECORDS),
|
||||||
Configuration.addDeprecation("mapred.skip.map.max.skip.records",
|
new DeprecationDelta("min.num.spills.for.combine",
|
||||||
new String[] {MRJobConfig.MAP_SKIP_MAX_RECORDS});
|
MRJobConfig.MAP_COMBINE_MIN_SPILLS),
|
||||||
Configuration.addDeprecation("min.num.spills.for.combine",
|
new DeprecationDelta("mapred.compress.map.output",
|
||||||
new String[] {MRJobConfig.MAP_COMBINE_MIN_SPILLS});
|
MRJobConfig.MAP_OUTPUT_COMPRESS),
|
||||||
Configuration.addDeprecation("mapred.compress.map.output",
|
new DeprecationDelta("mapred.map.output.compression.codec",
|
||||||
new String[] {MRJobConfig.MAP_OUTPUT_COMPRESS});
|
MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC),
|
||||||
Configuration.addDeprecation("mapred.map.output.compression.codec",
|
new DeprecationDelta("mapred.mapoutput.key.class",
|
||||||
new String[] {MRJobConfig.MAP_OUTPUT_COMPRESS_CODEC});
|
MRJobConfig.MAP_OUTPUT_KEY_CLASS),
|
||||||
Configuration.addDeprecation("mapred.mapoutput.key.class",
|
new DeprecationDelta("mapred.mapoutput.value.class",
|
||||||
new String[] {MRJobConfig.MAP_OUTPUT_KEY_CLASS});
|
MRJobConfig.MAP_OUTPUT_VALUE_CLASS),
|
||||||
Configuration.addDeprecation("mapred.mapoutput.value.class",
|
new DeprecationDelta("map.output.key.field.separator",
|
||||||
new String[] {MRJobConfig.MAP_OUTPUT_VALUE_CLASS});
|
MRJobConfig.MAP_OUTPUT_KEY_FIELD_SEPERATOR),
|
||||||
Configuration.addDeprecation("map.output.key.field.separator",
|
new DeprecationDelta("mapred.map.child.log.level",
|
||||||
new String[] {MRJobConfig.MAP_OUTPUT_KEY_FIELD_SEPERATOR});
|
MRJobConfig.MAP_LOG_LEVEL),
|
||||||
Configuration.addDeprecation("mapred.map.child.log.level",
|
new DeprecationDelta("mapred.inmem.merge.threshold",
|
||||||
new String[] {MRJobConfig.MAP_LOG_LEVEL});
|
MRJobConfig.REDUCE_MERGE_INMEM_THRESHOLD),
|
||||||
Configuration.addDeprecation("mapred.inmem.merge.threshold",
|
new DeprecationDelta("mapred.job.reduce.input.buffer.percent",
|
||||||
new String[] {MRJobConfig.REDUCE_MERGE_INMEM_THRESHOLD});
|
MRJobConfig.REDUCE_INPUT_BUFFER_PERCENT),
|
||||||
Configuration.addDeprecation("mapred.job.reduce.input.buffer.percent",
|
new DeprecationDelta("mapred.job.reduce.markreset.buffer.percent",
|
||||||
new String[] {MRJobConfig.REDUCE_INPUT_BUFFER_PERCENT});
|
MRJobConfig.REDUCE_MARKRESET_BUFFER_PERCENT),
|
||||||
Configuration.addDeprecation("mapred.job.reduce.markreset.buffer.percent",
|
new DeprecationDelta("mapred.job.reduce.memory.mb",
|
||||||
new String[] {MRJobConfig.REDUCE_MARKRESET_BUFFER_PERCENT});
|
MRJobConfig.REDUCE_MEMORY_MB),
|
||||||
Configuration.addDeprecation("mapred.job.reduce.memory.mb",
|
new DeprecationDelta("mapred.job.reduce.total.mem.bytes",
|
||||||
new String[] {MRJobConfig.REDUCE_MEMORY_MB});
|
MRJobConfig.REDUCE_MEMORY_TOTAL_BYTES),
|
||||||
Configuration.addDeprecation("mapred.job.reduce.total.mem.bytes",
|
new DeprecationDelta("mapred.job.shuffle.input.buffer.percent",
|
||||||
new String[] {MRJobConfig.REDUCE_MEMORY_TOTAL_BYTES});
|
MRJobConfig.SHUFFLE_INPUT_BUFFER_PERCENT),
|
||||||
Configuration.addDeprecation("mapred.job.shuffle.input.buffer.percent",
|
new DeprecationDelta("mapred.job.shuffle.merge.percent",
|
||||||
new String[] {MRJobConfig.SHUFFLE_INPUT_BUFFER_PERCENT});
|
MRJobConfig.SHUFFLE_MERGE_PERCENT),
|
||||||
Configuration.addDeprecation("mapred.job.shuffle.merge.percent",
|
new DeprecationDelta("mapred.max.reduce.failures.percent",
|
||||||
new String[] {MRJobConfig.SHUFFLE_MERGE_PERCENT});
|
MRJobConfig.REDUCE_FAILURES_MAXPERCENT),
|
||||||
Configuration.addDeprecation("mapred.max.reduce.failures.percent",
|
new DeprecationDelta("mapred.reduce.child.env",
|
||||||
new String[] {MRJobConfig.REDUCE_FAILURES_MAXPERCENT});
|
MRJobConfig.REDUCE_ENV),
|
||||||
Configuration.addDeprecation("mapred.reduce.child.env",
|
new DeprecationDelta("mapred.reduce.child.java.opts",
|
||||||
new String[] {MRJobConfig.REDUCE_ENV});
|
MRJobConfig.REDUCE_JAVA_OPTS),
|
||||||
Configuration.addDeprecation("mapred.reduce.child.java.opts",
|
new DeprecationDelta("mapred.reduce.max.attempts",
|
||||||
new String[] {MRJobConfig.REDUCE_JAVA_OPTS});
|
MRJobConfig.REDUCE_MAX_ATTEMPTS),
|
||||||
Configuration.addDeprecation("mapred.reduce.max.attempts",
|
new DeprecationDelta("mapred.reduce.parallel.copies",
|
||||||
new String[] {MRJobConfig.REDUCE_MAX_ATTEMPTS});
|
MRJobConfig.SHUFFLE_PARALLEL_COPIES),
|
||||||
Configuration.addDeprecation("mapred.reduce.parallel.copies",
|
new DeprecationDelta("mapred.reduce.task.debug.script",
|
||||||
new String[] {MRJobConfig.SHUFFLE_PARALLEL_COPIES});
|
MRJobConfig.REDUCE_DEBUG_SCRIPT),
|
||||||
Configuration.addDeprecation("mapred.reduce.task.debug.script",
|
new DeprecationDelta("mapred.reduce.tasks.speculative.execution",
|
||||||
new String[] {MRJobConfig.REDUCE_DEBUG_SCRIPT});
|
MRJobConfig.REDUCE_SPECULATIVE),
|
||||||
Configuration.addDeprecation("mapred.reduce.tasks.speculative.execution",
|
new DeprecationDelta("mapred.shuffle.connect.timeout",
|
||||||
new String[] {MRJobConfig.REDUCE_SPECULATIVE});
|
MRJobConfig.SHUFFLE_CONNECT_TIMEOUT),
|
||||||
Configuration.addDeprecation("mapred.shuffle.connect.timeout",
|
new DeprecationDelta("mapred.shuffle.read.timeout",
|
||||||
new String[] {MRJobConfig.SHUFFLE_CONNECT_TIMEOUT});
|
MRJobConfig.SHUFFLE_READ_TIMEOUT),
|
||||||
Configuration.addDeprecation("mapred.shuffle.read.timeout",
|
new DeprecationDelta("mapred.skip.reduce.auto.incr.proc.count",
|
||||||
new String[] {MRJobConfig.SHUFFLE_READ_TIMEOUT});
|
MRJobConfig.REDUCE_SKIP_INCR_PROC_COUNT),
|
||||||
Configuration.addDeprecation("mapred.skip.reduce.auto.incr.proc.count",
|
new DeprecationDelta("mapred.skip.reduce.max.skip.groups",
|
||||||
new String[] {MRJobConfig.REDUCE_SKIP_INCR_PROC_COUNT});
|
MRJobConfig.REDUCE_SKIP_MAXGROUPS),
|
||||||
Configuration.addDeprecation("mapred.skip.reduce.max.skip.groups",
|
new DeprecationDelta("mapred.reduce.child.log.level",
|
||||||
new String[] {MRJobConfig.REDUCE_SKIP_MAXGROUPS});
|
MRJobConfig.REDUCE_LOG_LEVEL),
|
||||||
Configuration.addDeprecation("mapred.reduce.child.log.level",
|
new DeprecationDelta("mapreduce.job.counters.limit",
|
||||||
new String[] {MRJobConfig.REDUCE_LOG_LEVEL});
|
MRJobConfig.COUNTERS_MAX_KEY),
|
||||||
Configuration.addDeprecation("mapreduce.job.counters.limit",
|
new DeprecationDelta("jobclient.completion.poll.interval",
|
||||||
new String[] {MRJobConfig.COUNTERS_MAX_KEY});
|
Job.COMPLETION_POLL_INTERVAL_KEY),
|
||||||
Configuration.addDeprecation("jobclient.completion.poll.interval",
|
new DeprecationDelta("jobclient.progress.monitor.poll.interval",
|
||||||
new String[] {Job.COMPLETION_POLL_INTERVAL_KEY});
|
Job.PROGRESS_MONITOR_POLL_INTERVAL_KEY),
|
||||||
Configuration.addDeprecation("jobclient.progress.monitor.poll.interval",
|
new DeprecationDelta("jobclient.output.filter",
|
||||||
new String[] {Job.PROGRESS_MONITOR_POLL_INTERVAL_KEY});
|
Job.OUTPUT_FILTER),
|
||||||
Configuration.addDeprecation("jobclient.output.filter",
|
new DeprecationDelta("mapred.submit.replication",
|
||||||
new String[] {Job.OUTPUT_FILTER});
|
Job.SUBMIT_REPLICATION),
|
||||||
Configuration.addDeprecation("mapred.submit.replication",
|
new DeprecationDelta("mapred.used.genericoptionsparser",
|
||||||
new String[] {Job.SUBMIT_REPLICATION});
|
Job.USED_GENERIC_PARSER),
|
||||||
Configuration.addDeprecation("mapred.used.genericoptionsparser",
|
new DeprecationDelta("mapred.input.dir",
|
||||||
new String[] {Job.USED_GENERIC_PARSER});
|
|
||||||
Configuration.addDeprecation("mapred.input.dir",
|
|
||||||
new String[] {
|
|
||||||
org.apache.hadoop.mapreduce.lib.input.FileInputFormat.INPUT_DIR});
|
|
||||||
Configuration.addDeprecation("mapred.input.pathFilter.class",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
FileInputFormat.PATHFILTER_CLASS});
|
|
||||||
Configuration.addDeprecation("mapred.max.split.size",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
FileInputFormat.SPLIT_MAXSIZE});
|
|
||||||
Configuration.addDeprecation("mapred.min.split.size",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
FileInputFormat.SPLIT_MINSIZE});
|
|
||||||
Configuration.addDeprecation("mapred.output.compress",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
FileOutputFormat.COMPRESS});
|
|
||||||
Configuration.addDeprecation("mapred.output.compression.codec",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
FileOutputFormat.COMPRESS_CODEC});
|
|
||||||
Configuration.addDeprecation("mapred.output.compression.type",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
FileOutputFormat.COMPRESS_TYPE});
|
|
||||||
Configuration.addDeprecation("mapred.output.dir",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
FileOutputFormat.OUTDIR});
|
|
||||||
Configuration.addDeprecation("mapred.seqbinary.output.key.class",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
SequenceFileAsBinaryOutputFormat.KEY_CLASS});
|
|
||||||
Configuration.addDeprecation("mapred.seqbinary.output.value.class",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
SequenceFileAsBinaryOutputFormat.VALUE_CLASS});
|
|
||||||
Configuration.addDeprecation("sequencefile.filter.class",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
SequenceFileInputFilter.FILTER_CLASS});
|
|
||||||
Configuration.addDeprecation("sequencefile.filter.regex",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
SequenceFileInputFilter.FILTER_REGEX});
|
|
||||||
Configuration.addDeprecation("sequencefile.filter.frequency",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
SequenceFileInputFilter.FILTER_FREQUENCY});
|
|
||||||
Configuration.addDeprecation("mapred.input.dir.mappers",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
MultipleInputs.DIR_MAPPERS});
|
|
||||||
Configuration.addDeprecation("mapred.input.dir.formats",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
MultipleInputs.DIR_FORMATS});
|
|
||||||
Configuration.addDeprecation("mapred.line.input.format.linespermap",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
NLineInputFormat.LINES_PER_MAP});
|
|
||||||
Configuration.addDeprecation("mapred.binary.partitioner.left.offset",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.partition.
|
|
||||||
BinaryPartitioner.LEFT_OFFSET_PROPERTY_NAME});
|
|
||||||
Configuration.addDeprecation("mapred.binary.partitioner.right.offset",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.partition.
|
|
||||||
BinaryPartitioner.RIGHT_OFFSET_PROPERTY_NAME});
|
|
||||||
Configuration.addDeprecation("mapred.text.key.comparator.options",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.partition.
|
|
||||||
KeyFieldBasedComparator.COMPARATOR_OPTIONS});
|
|
||||||
Configuration.addDeprecation("mapred.text.key.partitioner.options",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.partition.
|
|
||||||
KeyFieldBasedPartitioner.PARTITIONER_OPTIONS});
|
|
||||||
Configuration.addDeprecation("mapred.mapper.regex.group",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.map.RegexMapper.GROUP});
|
|
||||||
Configuration.addDeprecation("mapred.mapper.regex",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.map.RegexMapper.PATTERN});
|
|
||||||
Configuration.addDeprecation("create.empty.dir.if.nonexist",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.jobcontrol.
|
|
||||||
ControlledJob.CREATE_DIR});
|
|
||||||
Configuration.addDeprecation("mapred.data.field.separator",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.fieldsel.
|
|
||||||
FieldSelectionHelper.DATA_FIELD_SEPERATOR});
|
|
||||||
Configuration.addDeprecation("map.output.key.value.fields.spec",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.fieldsel.
|
|
||||||
FieldSelectionHelper.MAP_OUTPUT_KEY_VALUE_SPEC});
|
|
||||||
Configuration.addDeprecation("reduce.output.key.value.fields.spec",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.fieldsel.
|
|
||||||
FieldSelectionHelper.REDUCE_OUTPUT_KEY_VALUE_SPEC});
|
|
||||||
Configuration.addDeprecation("mapred.min.split.size.per.node",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
CombineFileInputFormat.SPLIT_MINSIZE_PERNODE});
|
|
||||||
Configuration.addDeprecation("mapred.min.split.size.per.rack",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
CombineFileInputFormat.SPLIT_MINSIZE_PERRACK});
|
|
||||||
Configuration.addDeprecation("key.value.separator.in.input.line",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
KeyValueLineRecordReader.KEY_VALUE_SEPERATOR});
|
|
||||||
Configuration.addDeprecation("mapred.linerecordreader.maxlength",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.input.
|
|
||||||
LineRecordReader.MAX_LINE_LENGTH});
|
|
||||||
Configuration.addDeprecation("mapred.lazy.output.format",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
LazyOutputFormat.OUTPUT_FORMAT});
|
|
||||||
Configuration.addDeprecation("mapred.textoutputformat.separator",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.output.
|
|
||||||
TextOutputFormat.SEPERATOR});
|
|
||||||
Configuration.addDeprecation("mapred.join.expr",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.join.
|
|
||||||
CompositeInputFormat.JOIN_EXPR});
|
|
||||||
Configuration.addDeprecation("mapred.join.keycomparator",
|
|
||||||
new String[] {org.apache.hadoop.mapreduce.lib.join.
|
|
||||||
CompositeInputFormat.JOIN_COMPARATOR});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.command-file.keep",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.
|
|
||||||
Submitter.PRESERVE_COMMANDFILE});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.executable",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.EXECUTABLE});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.executable.interpretor",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.INTERPRETOR});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.java.mapper",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_MAP});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.java.recordreader",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_RR});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.java.recordwriter",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_RW});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.java.reducer",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_REDUCE});
|
|
||||||
Configuration.addDeprecation("hadoop.pipes.partitioner",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.PARTITIONER});
|
|
||||||
Configuration.addDeprecation("mapred.pipes.user.inputformat",
|
|
||||||
new String[] {org.apache.hadoop.mapred.pipes.Submitter.INPUT_FORMAT});
|
|
||||||
|
|
||||||
Configuration.addDeprecation("webinterface.private.actions",
|
org.apache.hadoop.mapreduce.lib.input.FileInputFormat.INPUT_DIR),
|
||||||
new String[]{JTConfig.PRIVATE_ACTIONS_KEY});
|
new DeprecationDelta("mapred.input.pathFilter.class",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
FileInputFormat.PATHFILTER_CLASS),
|
||||||
|
new DeprecationDelta("mapred.max.split.size",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
FileInputFormat.SPLIT_MAXSIZE),
|
||||||
|
new DeprecationDelta("mapred.min.split.size",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
FileInputFormat.SPLIT_MINSIZE),
|
||||||
|
new DeprecationDelta("mapred.output.compress",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
FileOutputFormat.COMPRESS),
|
||||||
|
new DeprecationDelta("mapred.output.compression.codec",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
FileOutputFormat.COMPRESS_CODEC),
|
||||||
|
new DeprecationDelta("mapred.output.compression.type",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
FileOutputFormat.COMPRESS_TYPE),
|
||||||
|
new DeprecationDelta("mapred.output.dir",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
FileOutputFormat.OUTDIR),
|
||||||
|
new DeprecationDelta("mapred.seqbinary.output.key.class",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
SequenceFileAsBinaryOutputFormat.KEY_CLASS),
|
||||||
|
new DeprecationDelta("mapred.seqbinary.output.value.class",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
SequenceFileAsBinaryOutputFormat.VALUE_CLASS),
|
||||||
|
new DeprecationDelta("sequencefile.filter.class",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
SequenceFileInputFilter.FILTER_CLASS),
|
||||||
|
new DeprecationDelta("sequencefile.filter.regex",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
SequenceFileInputFilter.FILTER_REGEX),
|
||||||
|
new DeprecationDelta("sequencefile.filter.frequency",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
SequenceFileInputFilter.FILTER_FREQUENCY),
|
||||||
|
new DeprecationDelta("mapred.input.dir.mappers",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
MultipleInputs.DIR_MAPPERS),
|
||||||
|
new DeprecationDelta("mapred.input.dir.formats",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
MultipleInputs.DIR_FORMATS),
|
||||||
|
new DeprecationDelta("mapred.line.input.format.linespermap",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
NLineInputFormat.LINES_PER_MAP),
|
||||||
|
new DeprecationDelta("mapred.binary.partitioner.left.offset",
|
||||||
|
org.apache.hadoop.mapreduce.lib.partition.
|
||||||
|
BinaryPartitioner.LEFT_OFFSET_PROPERTY_NAME),
|
||||||
|
new DeprecationDelta("mapred.binary.partitioner.right.offset",
|
||||||
|
org.apache.hadoop.mapreduce.lib.partition.
|
||||||
|
BinaryPartitioner.RIGHT_OFFSET_PROPERTY_NAME),
|
||||||
|
new DeprecationDelta("mapred.text.key.comparator.options",
|
||||||
|
org.apache.hadoop.mapreduce.lib.partition.
|
||||||
|
KeyFieldBasedComparator.COMPARATOR_OPTIONS),
|
||||||
|
new DeprecationDelta("mapred.text.key.partitioner.options",
|
||||||
|
org.apache.hadoop.mapreduce.lib.partition.
|
||||||
|
KeyFieldBasedPartitioner.PARTITIONER_OPTIONS),
|
||||||
|
new DeprecationDelta("mapred.mapper.regex.group",
|
||||||
|
org.apache.hadoop.mapreduce.lib.map.RegexMapper.GROUP),
|
||||||
|
new DeprecationDelta("mapred.mapper.regex",
|
||||||
|
org.apache.hadoop.mapreduce.lib.map.RegexMapper.PATTERN),
|
||||||
|
new DeprecationDelta("create.empty.dir.if.nonexist",
|
||||||
|
org.apache.hadoop.mapreduce.lib.jobcontrol.
|
||||||
|
ControlledJob.CREATE_DIR),
|
||||||
|
new DeprecationDelta("mapred.data.field.separator",
|
||||||
|
org.apache.hadoop.mapreduce.lib.fieldsel.
|
||||||
|
FieldSelectionHelper.DATA_FIELD_SEPERATOR),
|
||||||
|
new DeprecationDelta("map.output.key.value.fields.spec",
|
||||||
|
org.apache.hadoop.mapreduce.lib.fieldsel.
|
||||||
|
FieldSelectionHelper.MAP_OUTPUT_KEY_VALUE_SPEC),
|
||||||
|
new DeprecationDelta("reduce.output.key.value.fields.spec",
|
||||||
|
org.apache.hadoop.mapreduce.lib.fieldsel.
|
||||||
|
FieldSelectionHelper.REDUCE_OUTPUT_KEY_VALUE_SPEC),
|
||||||
|
new DeprecationDelta("mapred.min.split.size.per.node",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
CombineFileInputFormat.SPLIT_MINSIZE_PERNODE),
|
||||||
|
new DeprecationDelta("mapred.min.split.size.per.rack",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
CombineFileInputFormat.SPLIT_MINSIZE_PERRACK),
|
||||||
|
new DeprecationDelta("key.value.separator.in.input.line",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
KeyValueLineRecordReader.KEY_VALUE_SEPERATOR),
|
||||||
|
new DeprecationDelta("mapred.linerecordreader.maxlength",
|
||||||
|
org.apache.hadoop.mapreduce.lib.input.
|
||||||
|
LineRecordReader.MAX_LINE_LENGTH),
|
||||||
|
new DeprecationDelta("mapred.lazy.output.format",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
LazyOutputFormat.OUTPUT_FORMAT),
|
||||||
|
new DeprecationDelta("mapred.textoutputformat.separator",
|
||||||
|
org.apache.hadoop.mapreduce.lib.output.
|
||||||
|
TextOutputFormat.SEPERATOR),
|
||||||
|
new DeprecationDelta("mapred.join.expr",
|
||||||
|
org.apache.hadoop.mapreduce.lib.join.
|
||||||
|
CompositeInputFormat.JOIN_EXPR),
|
||||||
|
new DeprecationDelta("mapred.join.keycomparator",
|
||||||
|
org.apache.hadoop.mapreduce.lib.join.
|
||||||
|
CompositeInputFormat.JOIN_COMPARATOR),
|
||||||
|
new DeprecationDelta("hadoop.pipes.command-file.keep",
|
||||||
|
org.apache.hadoop.mapred.pipes.
|
||||||
|
Submitter.PRESERVE_COMMANDFILE),
|
||||||
|
new DeprecationDelta("hadoop.pipes.executable",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.EXECUTABLE),
|
||||||
|
new DeprecationDelta("hadoop.pipes.executable.interpretor",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.INTERPRETOR),
|
||||||
|
new DeprecationDelta("hadoop.pipes.java.mapper",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_MAP),
|
||||||
|
new DeprecationDelta("hadoop.pipes.java.recordreader",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_RR),
|
||||||
|
new DeprecationDelta("hadoop.pipes.java.recordwriter",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_RW),
|
||||||
|
new DeprecationDelta("hadoop.pipes.java.reducer",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.IS_JAVA_REDUCE),
|
||||||
|
new DeprecationDelta("hadoop.pipes.partitioner",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.PARTITIONER),
|
||||||
|
new DeprecationDelta("mapred.pipes.user.inputformat",
|
||||||
|
org.apache.hadoop.mapred.pipes.Submitter.INPUT_FORMAT),
|
||||||
|
|
||||||
Configuration.addDeprecation("security.task.umbilical.protocol.acl",
|
new DeprecationDelta("webinterface.private.actions",
|
||||||
new String[] {
|
JTConfig.PRIVATE_ACTIONS_KEY),
|
||||||
MRJobConfig.MR_AM_SECURITY_SERVICE_AUTHORIZATION_TASK_UMBILICAL
|
|
||||||
|
new DeprecationDelta("security.task.umbilical.protocol.acl",
|
||||||
|
MRJobConfig.MR_AM_SECURITY_SERVICE_AUTHORIZATION_TASK_UMBILICAL),
|
||||||
|
new DeprecationDelta("security.job.submission.protocol.acl",
|
||||||
|
MRJobConfig.MR_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT),
|
||||||
|
new DeprecationDelta("mapreduce.user.classpath.first",
|
||||||
|
MRJobConfig.MAPREDUCE_JOB_USER_CLASSPATH_FIRST ),
|
||||||
|
new DeprecationDelta(JTConfig.JT_MAX_JOB_SPLIT_METAINFO_SIZE,
|
||||||
|
MRJobConfig.SPLIT_METAINFO_MAXSIZE),
|
||||||
|
new DeprecationDelta("mapred.input.dir.recursive",
|
||||||
|
FileInputFormat.INPUT_DIR_RECURSIVE)
|
||||||
});
|
});
|
||||||
Configuration.addDeprecation("security.job.submission.protocol.acl",
|
|
||||||
new String[] {
|
|
||||||
MRJobConfig.MR_AM_SECURITY_SERVICE_AUTHORIZATION_CLIENT
|
|
||||||
});
|
|
||||||
Configuration.addDeprecation("mapreduce.user.classpath.first",
|
|
||||||
MRJobConfig.MAPREDUCE_JOB_USER_CLASSPATH_FIRST);
|
|
||||||
Configuration.addDeprecation(JTConfig.JT_MAX_JOB_SPLIT_METAINFO_SIZE,
|
|
||||||
MRJobConfig.SPLIT_METAINFO_MAXSIZE);
|
|
||||||
Configuration.addDeprecation("mapred.input.dir.recursive",
|
|
||||||
FileInputFormat.INPUT_DIR_RECURSIVE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@ import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.hadoop.conf.Configurable;
|
import org.apache.hadoop.conf.Configurable;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
import org.apache.hadoop.conf.Configuration.DeprecationDelta;
|
||||||
import org.apache.hadoop.fs.FileSystem;
|
import org.apache.hadoop.fs.FileSystem;
|
||||||
import org.apache.hadoop.fs.Path;
|
import org.apache.hadoop.fs.Path;
|
||||||
import org.apache.hadoop.io.LongWritable;
|
import org.apache.hadoop.io.LongWritable;
|
||||||
|
|
@ -71,11 +72,12 @@ public class Logalyzer {
|
||||||
"logalizer.logcomparator.column.separator";
|
"logalizer.logcomparator.column.separator";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
Configuration.addDeprecation("mapred.reducer.sort",
|
Configuration.addDeprecations(new DeprecationDelta[] {
|
||||||
new String[] {SORT_COLUMNS});
|
new DeprecationDelta("mapred.reducer.sort", SORT_COLUMNS),
|
||||||
Configuration.addDeprecation("mapred.reducer.separator",
|
new DeprecationDelta("mapred.reducer.separator", COLUMN_SEPARATOR)
|
||||||
new String[] {COLUMN_SEPARATOR});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** A {@link Mapper} that extracts text matching a regular expression. */
|
/** A {@link Mapper} that extracts text matching a regular expression. */
|
||||||
public static class LogRegexMapper<K extends WritableComparable>
|
public static class LogRegexMapper<K extends WritableComparable>
|
||||||
extends MapReduceBase
|
extends MapReduceBase
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.hadoop.classification.InterfaceAudience;
|
import org.apache.hadoop.classification.InterfaceAudience;
|
||||||
import org.apache.hadoop.classification.InterfaceStability;
|
import org.apache.hadoop.classification.InterfaceStability;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
import org.apache.hadoop.conf.Configuration.DeprecationDelta;
|
||||||
import org.apache.hadoop.fs.FileSystem;
|
import org.apache.hadoop.fs.FileSystem;
|
||||||
import org.apache.hadoop.fs.Path;
|
import org.apache.hadoop.fs.Path;
|
||||||
import org.apache.hadoop.fs.permission.FsAction;
|
import org.apache.hadoop.fs.permission.FsAction;
|
||||||
|
|
@ -118,10 +119,12 @@ class DistributedCacheEmulator {
|
||||||
{
|
{
|
||||||
// Need to handle deprecation of these MapReduce-internal configuration
|
// Need to handle deprecation of these MapReduce-internal configuration
|
||||||
// properties as MapReduce doesn't handle their deprecation.
|
// properties as MapReduce doesn't handle their deprecation.
|
||||||
Configuration.addDeprecation("mapred.cache.files.filesizes",
|
Configuration.addDeprecations(new DeprecationDelta[] {
|
||||||
new String[] {MRJobConfig.CACHE_FILES_SIZES});
|
new DeprecationDelta("mapred.cache.files.filesizes",
|
||||||
Configuration.addDeprecation("mapred.cache.files.visibilities",
|
MRJobConfig.CACHE_FILES_SIZES),
|
||||||
new String[] {MRJobConfig.CACHE_FILE_VISIBILITIES});
|
new DeprecationDelta("mapred.cache.files.visibilities",
|
||||||
|
MRJobConfig.CACHE_FILE_VISIBILITIES)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue