honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build: Fix delayed extra config file checks to be right before copy

Browse Source 
The current delay waits until later after normal configuration, but
still just after resolution (ie when paths would be known for
dependencies but not actual execution). This delays the checks further
to be done right before we actually execute the copy task.

closes #15068
This commit is contained in:
Ryan Ernst 2015-11-28 18:04:15 -08:00
parent b375084305
commit 018c766bf7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
View File

@ -185,7 +185,8 @@ class ClusterFormationTasks {
Copy copyConfig = project.tasks.create(name: name, type: Copy, dependsOn: setup) Copy copyConfig = project.tasks.create(name: name, type: Copy, dependsOn: setup)
copyConfig.into(new File(node.homeDir, 'config')) // copy must always have a general dest dir, even though we don't use it copyConfig.into(new File(node.homeDir, 'config')) // copy must always have a general dest dir, even though we don't use it
for (Map.Entry<String,Object> extraConfigFile : node.config.extraConfigFiles.entrySet()) { for (Map.Entry<String,Object> extraConfigFile : node.config.extraConfigFiles.entrySet()) {
Closure delayedSrc = { copyConfig.doFirst {
// make sure the copy won't be a no-op or act on a directory
File srcConfigFile = project.file(extraConfigFile.getValue()) File srcConfigFile = project.file(extraConfigFile.getValue())
if (srcConfigFile.isDirectory()) { if (srcConfigFile.isDirectory()) {
throw new GradleException("Source for extraConfigFile must be a file: ${srcConfigFile}") throw new GradleException("Source for extraConfigFile must be a file: ${srcConfigFile}")
@ -193,11 +194,10 @@ class ClusterFormationTasks {
if (srcConfigFile.exists() == false) { if (srcConfigFile.exists() == false) {
throw new GradleException("Source file for extraConfigFile does not exist: ${srcConfigFile}") throw new GradleException("Source file for extraConfigFile does not exist: ${srcConfigFile}")
} }
return srcConfigFile
} }
File destConfigFile = new File(node.homeDir, 'config/' + extraConfigFile.getKey()) File destConfigFile = new File(node.homeDir, 'config/' + extraConfigFile.getKey())
copyConfig.from(delayedSrc) copyConfig.into(destConfigFile.canonicalFile.parentFile)
.into(destConfigFile.canonicalFile.parentFile) .from({ extraConfigFile.getValue() }) // wrap in closure to delay resolution to execution time
.rename { destConfigFile.name } .rename { destConfigFile.name }
} }
return copyConfig return copyConfig