[FIXED JENKINS-11251]

The actual meat of the change is in remoting.
jenkinsci · Jun 16, 2012 · f49d625 · f49d625
1 parent 9a178aa
commit f49d625
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Fixed a synchronization problem between master/slave data communication.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-11251">issue 11251</a>)
   <li class=rfe>
     Added a mechanism to filter extension points as they are discovered.
   <li class=rfe>

diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
@@ -1456,6 +1456,16 @@ public String readToString() throws IOException {
      * Writes to this file.
      * If this file already exists, it will be overwritten.
      * If the directory doesn't exist, it will be created.
+     *
+     * <P>
+     * I/O operation to remote {@link FilePath} happens asynchronously, meaning write operations to the returned
+     * {@link OutputStream} will return without receiving a confirmation from the remote that the write happened.
+     * I/O operations also happens asynchronously from the {@link Channel#call(Callable)} operations, so if
+     * you write to a remote file and then execute {@link Channel#call(Callable)} and try to access the newly copied
+     * file, it might not be fully written yet.
+     *
+     * <p>
+     *
      */
     public OutputStream write() throws IOException, InterruptedException {
         if(channel==null) {
@@ -1596,10 +1606,16 @@ public Void invoke(File f, VirtualChannel channel) throws IOException {
             }
         });
 
-        // make sure the write fully happens before we return.
+        // make sure the writes fully got delivered to 'os' before we return.
+        // this is needed because I/O operation is asynchronous
         syncIO();
     }
 
+    /**
+     * With fix to JENKINS-11251 (remoting 2.15), this is no longer necessary.
+     * But I'm keeping it for a while so that users who manually deploy slave.jar has time to deploy new version
+     * before this goes away.
+     */
     private void syncIO() throws InterruptedException {
         try {
             if (channel!=null)

diff --git a/pom.xml b/pom.xml
@@ -189,7 +189,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.13</version>
+        <version>2.16</version>
       </dependency>
 
       <dependency>