You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by vi...@apache.org on 2012/02/29 05:56:30 UTC
svn commit: r1294971 - in
/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project: CHANGES.txt
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/LocalResourcePBImpl.java
Author: vinodkv
Date: Wed Feb 29 04:56:30 2012
New Revision: 1294971
URL: http://svn.apache.org/viewvc?rev=1294971&view=rev
Log:
MAPREDUCE-3931. Changed PB implementation of LocalResource to take locks so that race conditions don't fail tasks by inadvertantly changing the timestamps. Contributed by Siddarth Seth.
svn merge --ignore-ancestry -c 1294970 ../../trunk
Modified:
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/LocalResourcePBImpl.java
Modified: hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt?rev=1294971&r1=1294970&r2=1294971&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/CHANGES.txt Wed Feb 29 04:56:30 2012
@@ -95,6 +95,10 @@ Release 0.23.2 - UNRELEASED
task attempt without an assigned container. (Robert Joseph Evans via
sseth)
+ MAPREDUCE-3931. Changed PB implementation of LocalResource to take locks
+ so that race conditions don't fail tasks by inadvertantly changing the
+ timestamps. (Siddarth Seth via vinodkv)
+
Release 0.23.1 - 2012-02-17
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/LocalResourcePBImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/LocalResourcePBImpl.java?rev=1294971&r1=1294970&r2=1294971&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/LocalResourcePBImpl.java (original)
+++ hadoop/common/branches/branch-0.23.2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/LocalResourcePBImpl.java Wed Feb 29 04:56:30 2012
@@ -32,14 +32,14 @@ import org.apache.hadoop.yarn.util.Proto
-public class LocalResourcePBImpl extends ProtoBase<LocalResourceProto> implements LocalResource {
+public class LocalResourcePBImpl extends ProtoBase<LocalResourceProto>
+ implements LocalResource {
LocalResourceProto proto = LocalResourceProto.getDefaultInstance();
LocalResourceProto.Builder builder = null;
boolean viaProto = false;
-
+
private URL url = null;
-
-
+
public LocalResourcePBImpl() {
builder = LocalResourceProto.newBuilder();
}
@@ -48,60 +48,55 @@ public class LocalResourcePBImpl extends
this.proto = proto;
viaProto = true;
}
-
- public LocalResourceProto getProto() {
- mergeLocalToProto();
+
+ public synchronized LocalResourceProto getProto() {
+ mergeLocalToBuilder();
proto = viaProto ? proto : builder.build();
viaProto = true;
return proto;
}
- private void mergeLocalToBuilder() {
- if (this.url != null) {
+ private synchronized void mergeLocalToBuilder() {
+ LocalResourceProtoOrBuilder l = viaProto ? proto : builder;
+ if (this.url != null
+ && !(l.getResource().equals(((URLPBImpl) url).getProto()))) {
+ maybeInitBuilder();
+ l = builder;
builder.setResource(convertToProtoFormat(this.url));
}
}
- private void mergeLocalToProto() {
- if (viaProto)
- maybeInitBuilder();
- mergeLocalToBuilder();
- proto = builder.build();
- viaProto = true;
- }
-
- private void maybeInitBuilder() {
+ private synchronized void maybeInitBuilder() {
if (viaProto || builder == null) {
builder = LocalResourceProto.newBuilder(proto);
}
viaProto = false;
}
-
-
+
@Override
- public long getSize() {
+ public synchronized long getSize() {
LocalResourceProtoOrBuilder p = viaProto ? proto : builder;
return (p.getSize());
}
@Override
- public void setSize(long size) {
+ public synchronized void setSize(long size) {
maybeInitBuilder();
builder.setSize((size));
}
@Override
- public long getTimestamp() {
+ public synchronized long getTimestamp() {
LocalResourceProtoOrBuilder p = viaProto ? proto : builder;
return (p.getTimestamp());
}
@Override
- public void setTimestamp(long timestamp) {
+ public synchronized void setTimestamp(long timestamp) {
maybeInitBuilder();
builder.setTimestamp((timestamp));
}
@Override
- public LocalResourceType getType() {
+ public synchronized LocalResourceType getType() {
LocalResourceProtoOrBuilder p = viaProto ? proto : builder;
if (!p.hasType()) {
return null;
@@ -110,7 +105,7 @@ public class LocalResourcePBImpl extends
}
@Override
- public void setType(LocalResourceType type) {
+ public synchronized void setType(LocalResourceType type) {
maybeInitBuilder();
if (type == null) {
builder.clearType();
@@ -119,7 +114,7 @@ public class LocalResourcePBImpl extends
builder.setType(convertToProtoFormat(type));
}
@Override
- public URL getResource() {
+ public synchronized URL getResource() {
LocalResourceProtoOrBuilder p = viaProto ? proto : builder;
if (this.url != null) {
return this.url;
@@ -132,14 +127,14 @@ public class LocalResourcePBImpl extends
}
@Override
- public void setResource(URL resource) {
+ public synchronized void setResource(URL resource) {
maybeInitBuilder();
if (resource == null)
builder.clearResource();
this.url = resource;
}
@Override
- public LocalResourceVisibility getVisibility() {
+ public synchronized LocalResourceVisibility getVisibility() {
LocalResourceProtoOrBuilder p = viaProto ? proto : builder;
if (!p.hasVisibility()) {
return null;
@@ -148,7 +143,7 @@ public class LocalResourcePBImpl extends
}
@Override
- public void setVisibility(LocalResourceVisibility visibility) {
+ public synchronized void setVisibility(LocalResourceVisibility visibility) {
maybeInitBuilder();
if (visibility == null) {
builder.clearVisibility();
@@ -180,7 +175,4 @@ public class LocalResourcePBImpl extends
private LocalResourceVisibility convertFromProtoFormat(LocalResourceVisibilityProto e) {
return ProtoUtils.convertFromProtoFormat(e);
}
-
-
-
}