hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r829291 - in /hadoop/hdfs/branches/branch-0.21: CHANGES.txt build.xml
Date Sat, 24 Oct 2009 00:35:58 GMT
Author: cos
Date: Sat Oct 24 00:35:58 2009
New Revision: 829291

URL: http://svn.apache.org/viewvc?rev=829291&view=rev
Log:
HDFS-584. svn merge -c 829258 from trunk to branch0.21

Modified:
    hadoop/hdfs/branches/branch-0.21/CHANGES.txt
    hadoop/hdfs/branches/branch-0.21/build.xml   (contents, props changed)

Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=829291&r1=829290&r2=829291&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Sat Oct 24 00:35:58 2009
@@ -282,6 +282,8 @@
 
     HDFS-616. Create functional tests for new design of the block report. (cos)
     
+    HDFS-584. Fail the fault-inject build if any advices are mis-bound. (cos)
+    
   BUG FIXES
 
     HDFS-76. Better error message to users when commands fail because of 

Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=829291&r1=829290&r2=829291&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Sat Oct 24 00:35:58 2009
@@ -324,6 +324,7 @@
   	Later on one can run 'ant jar-fault-inject' to create
   	Hadoop jar file with instrumented classes
   -->
+  <property name="compile-inject.output" value="${build-fi.dir}/compile-fi.log"/>
   <target name="compile-fault-inject" depends="compile-core, compile-hdfs-test">
     <!-- AspectJ task definition -->
     <taskdef
@@ -344,11 +345,26 @@
       deprecation="${javac.deprecation}">
       <classpath refid="test.classpath"/>
     </iajc>
+    <loadfile property="injection.failure" srcfile="${compile-inject.output}">
+      <filterchain>
+        <linecontainsregexp>
+          <regexp pattern='iajc.*warning'/>
+        </linecontainsregexp>
+      </filterchain>
+    </loadfile>
+    <fail if="injection.failure">
+      Broken binding of advises: ${line.separator}${injection.failure}
+    </fail>
     <echo message="Weaving of aspects is finished"/>
   </target>
 
-  <target name="injectfaults" description="Instrument HDFS classes with faults and other
AOP advices">
-    <subant buildpath="${basedir}" target="compile-fault-inject">
+  <target name="injectfaults"
+          description="Instrument HDFS classes with faults and other AOP advices">
+    <!--mkdir to prevent <subant> failure in case the folder has been removed-->
+    <mkdir dir="${build-fi.dir}"/>
+    <delete file="${compile-inject.output}"/>
+    <subant buildpath="${basedir}" target="compile-fault-inject"
+            output="${compile-inject.output}">
       <property name="build.dir" value="${build-fi.dir}"/>
     </subant>
   </target>

Propchange: hadoop/hdfs/branches/branch-0.21/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 24 00:35:58 2009
@@ -1,4 +1,4 @@
 /hadoop/core/branches/branch-0.19/hdfs/build.xml:713112
 /hadoop/core/trunk/build.xml:779102
 /hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
-/hadoop/hdfs/trunk/build.xml:818294-818298,824552,824944,825229,826149,828116,828926
+/hadoop/hdfs/trunk/build.xml:818294-818298,824552,824944,825229,826149,828116,828926,829258



Mime
View raw message