2828 *
2929 * <p>
3030 * This substantially improves the performance by reducing the amount of data that needs to be transferred.
31- * One cache will be built on the Hudson master , then per-slave cache is cloned from there.
31+ * One cache will be built on the Hudson controller , then per-agent cache is cloned from there.
3232 *
3333 * @see HUDSON-4794: manages repository caches.
3434 * @author Jesse Glick
@@ -73,8 +73,8 @@ private Cache(String remote, String hash, StandardUsernameCredentials credential
7373 }
7474
7575 /**
76- * Gets a lock for the given slave node.
77- * @param node Name of the slave node.
76+ * Gets a lock for the given agent node.
77+ * @param node Name of the agent node.
7878 * @return The {@link ReentrantLock} instance.
7979 */
8080 private synchronized ReentrantLock getLockForSlaveNode (String node ) {
@@ -95,19 +95,19 @@ private synchronized ReentrantLock getLockForSlaveNode(String node) {
9595 * The node that gets a local cached repository.
9696 *
9797 * @return
98- * The file path on the {@code node} to the local repository cache, cloned off from the master cache.
98+ * The file path on the {@code node} to the local repository cache, cloned off from the controller cache.
9999 */
100100 @ CheckForNull FilePath repositoryCache (MercurialInstallation inst , Node node , Launcher launcher , TaskListener listener , boolean useTimeout )
101101 throws IOException , InterruptedException {
102102 boolean masterWasLocked = masterLock .isLocked ();
103103 if (masterWasLocked ) {
104- listener .getLogger ().println ("Waiting for master lock on hgcache/" + hash + " " + masterLock + "..." );
104+ listener .getLogger ().println ("Waiting for controller lock on hgcache/" + hash + " " + masterLock + "..." );
105105 }
106106
107- // Always update master cache first.
107+ // Always update controller cache first.
108108 final Node master = Jenkins .getInstance ();
109109 if (master == null ) { // Should not happen
110- throw new IOException ("Cannot retrieve the Jenkins master node" );
110+ throw new IOException ("Cannot retrieve the Jenkins controller node" );
111111 }
112112
113113 FilePath masterCaches = null ;
@@ -116,23 +116,23 @@ private synchronized ReentrantLock getLockForSlaveNode(String node) {
116116 } else {
117117 FilePath rootPath = master .getRootPath ();
118118 if (rootPath == null ) {
119- throw new IOException ("Cannot retrieve the root directory of the Jenkins master node" );
119+ throw new IOException ("Cannot retrieve the root directory of the Jenkins controller node" );
120120 }
121121 masterCaches = rootPath .child ("hgcache" );
122122 }
123123
124124 FilePath masterCache = masterCaches .child (hash );
125125 Launcher masterLauncher = node == master ? launcher : master .createLauncher (listener );
126126
127- // hg invocation on master
127+ // hg invocation on controller
128128 // do we need to pass in EnvVars from a build too?
129129 try (HgExe masterHg = new HgExe (inst , credentials , masterLauncher , master , listener , new EnvVars ())) {
130- // Lock the block used to verify we end up having a cloned repo in the master ,
130+ // Lock the block used to verify we end up having a cloned repo in the controller ,
131131 // whether if it was previously cloned in a different build or if it's
132132 // going to be cloned right now.
133133 masterLock .lockInterruptibly ();
134134 try {
135- listener .getLogger ().println ("Acquired master cache lock." );
135+ listener .getLogger ().println ("Acquired controller cache lock." );
136136 // TODO use getCredentials()
137137 if (masterCache .isDirectory ()) {
138138 ArgumentListBuilder args = masterHg .seed (true ).add ("pull" );
@@ -150,27 +150,27 @@ private synchronized ReentrantLock getLockForSlaveNode(String node) {
150150 }
151151 } finally {
152152 masterLock .unlock ();
153- listener .getLogger ().println ("Master cache lock released." );
153+ listener .getLogger ().println ("Controller cache lock released." );
154154 }
155155 if (node == master ) {
156156 return masterCache ;
157157 }
158- // Not on master , so need to create/update local cache as well.
158+ // Not on controller , so need to create/update local cache as well.
159159
160- // We are in a slave node that will need also an updated local cache: clone it or
160+ // We are in a agent node that will need also an updated local cache: clone it or
161161 // pull pending changes, if any. This can be safely done in parallel in
162- // different slave nodes for a given repo, so we'll use different
162+ // different agent nodes for a given repo, so we'll use different
163163 // node-specific locks to achieve this.
164164 ReentrantLock slaveNodeLock = getLockForSlaveNode (node .getNodeName ());
165165
166166 boolean slaveNodeWasLocked = slaveNodeLock .isLocked ();
167167 if (slaveNodeWasLocked ) {
168- listener .getLogger ().println ("Waiting for slave node cache lock in " + node .getNodeName () + " on hgcache/" + hash + " " + slaveNodeWasLocked + "..." );
168+ listener .getLogger ().println ("Waiting for agent node cache lock in " + node .getNodeName () + " on hgcache/" + hash + " " + slaveNodeWasLocked + "..." );
169169 }
170170
171171 slaveNodeLock .lockInterruptibly ();
172172 try {
173- listener .getLogger ().println ("Acquired slave node cache lock for node " + node .getNodeName () + "." );
173+ listener .getLogger ().println ("Acquired agent node cache lock for node " + node .getNodeName () + "." );
174174
175175 final FilePath nodeRootPath = node .getRootPath ();
176176 if (nodeRootPath == null ) {
@@ -186,7 +186,7 @@ private synchronized ReentrantLock getLockForSlaveNode(String node) {
186186 FilePath masterTransfer = masterCache .child (bundleFileName );
187187 FilePath localTransfer = localCache .child ("xfer.hg" );
188188 try {
189- // hg invocation on the slave
189+ // hg invocation on the agent
190190 try (HgExe slaveHg = new HgExe (inst , credentials , launcher , node , listener , new EnvVars ())) {
191191 if (localCache .isDirectory ()) {
192192 // Need to transfer just newly available changesets.
@@ -195,8 +195,8 @@ private synchronized ReentrantLock getLockForSlaveNode(String node) {
195195 if (localHeads .equals (masterHeads )) {
196196 listener .getLogger ().println ("Local cache is up to date." );
197197 } else {
198- // If there are some local heads not in master , they must be ancestors of new heads.
199- // If there are some master heads not in local, they could be descendants of old heads,
198+ // If there are some local heads not in controller , they must be ancestors of new heads.
199+ // If there are some controller heads not in local, they could be descendants of old heads,
200200 // or they could be new branches.
201201 // Issue1910: in Hg 1.4.3 and earlier, passing --base $h for h in localHeads will fail
202202 // to actually exclude those head sets, but not a big deal. (Hg 1.5 fixes that but leaves
@@ -235,7 +235,7 @@ private synchronized ReentrantLock getLockForSlaveNode(String node) {
235235 return localCache ;
236236 } finally {
237237 slaveNodeLock .unlock ();
238- listener .getLogger ().println ("Slave node cache lock released for node " + node .getNodeName () + "." );
238+ listener .getLogger ().println ("agent node cache lock released for node " + node .getNodeName () + "." );
239239 }
240240 }
241241 }
0 commit comments