WebSVN – DevTools – Diff – /buildtool/trunk/src/main/java/com/erggroup/buildtool/ripple/ReleaseManager.java

                 int rootPvId = rset.getInt("root_pv_id", -1);
                 String rootCause = rset.getString("root_cause", null);
                 // force email notification by using a zero test build instruction
                 BuildExclusion buildExclusion = new BuildExclusion(pvId, rootPvId, rootCause, 0);
+                buildExclusion.setImported();
                 buildExclusionCollection.add(buildExclusion);
+            }
             rset.close();
             stmt.close();
             handleSQLException(e, "");
+        }
+    }
     /**
-     * attempts to execute the Exclude_Indirect_From_Build stored procedure
+     * Execute the Exclude_Indirect_From_Build stored procedure
      *  Note: Execute_Indirect_From_Build will delete matching do_not_ripple
      *        rows prior to an insertion - this is crucial!!
+     *
+     * Note: The name 'Execute_Indirect_From_Build' is misleading as it appears to be used for both direct and indirect
+     *       exclusions.
+     *
      * @param hasConnection        IN True. Use existing connection and will not commit the operation
      * @param packageVersionId     IN passed to Exclude_Indirect_From_Build
      * @param packageVersion       IN passed to Exclude_Indirect_From_Build
      * @param rtagId               IN passed to Exclude_Indirect_From_Build
      * @param rootPvId             IN passed to Exclude_Indirect_From_Build
+            {
                 if (!hasConnection)
                     connect();
                 boolean exist = false;
+                boolean dbIsIndirect = false;
+                boolean entryIsIndirect = (rootPvId != null);
                 if ( !supercede )
+                {
                     // do not exclude a package already excluded ie let the first build failure count
                     // there is a window of opportunity here, but it is worth doing
                     //      1 this query (run by a slave) indicates no build failure exists on this version
                     //      2 build failure is reported
                     //      3 master build machine detects slave in state waiting
                     //      4 master daemon discovers slave did not deliver artifacts
                     //      5 master daemon is prevented from overriding the build failure
+                    //
+                    // Another complication
+                    //  If this is a direct exclusion (rootPvid) is null and the entry in the table is an indirect exclusion
+                    //  then we should delete the indirect exclusion and replace it with a direct exclusion
+                    //
-                    CallableStatement stmt = mConnection.prepareCall("select pv_id from release_manager.do_not_ripple where pv_id=" + packageVersionId + "and rtag_id=" + rtagId);
+                    CallableStatement stmt = mConnection.prepareCall("select pv_id, root_pv_id from release_manager.do_not_ripple where pv_id=" + packageVersionId + "and rtag_id=" + rtagId);
                     ResultSet rset = stmt.executeQuery();
                     while( rset.next() )
+                    {
                         exist = true;
+                        rset.getInt("root_pv_id");
+                        dbIsIndirect = ! rset.wasNull();
+                        // Override an indirect database entry with a direct exclusion
+                        if ( dbIsIndirect && ! entryIsIndirect ) {
+                            exist = false;
+                        }
                         break;
+                    }
                     rset.close();
                     stmt.close();

Subversion Repositories DevTools

(root)/buildtool/trunk/src/main/java/com/erggroup/buildtool/ripple/ReleaseManager.java – Rev 7023 → 7032