github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add support for building elasticsearch source on macos before monterey (#87430)

Browse source 
Closes #87426
This commit is contained in:
Juan Camilo Bages 2022-06-06 16:09:57 -05:00 • committed by GitHub
parent c95230d155
commit abc174bdad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/info/ParallelDetector.java
View file

@ -8,6 +8,8 @@
package org.elasticsearch.gradle.internal.conventions.info; package org.elasticsearch.gradle.internal.conventions.info;
import org.gradle.api.logging.Logger;
import org.gradle.api.logging.Logging;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.provider.ProviderFactory; import org.gradle.api.provider.ProviderFactory;
@ -26,6 +28,9 @@ import java.util.stream.Collectors;
public class ParallelDetector { public class ParallelDetector {
private static Integer _defaultParallel = null; private static Integer _defaultParallel = null;
private static final Logger LOGGER = Logging.getLogger(ParallelDetector.class);
private final static int MACOS_MONTEREY_MAJOR_VERSION = 12;
public static int findDefaultParallel(Project project) { public static int findDefaultParallel(Project project) {
// Since it costs IO to compute this, and is done at configuration time we want to cache this if possible // Since it costs IO to compute this, and is done at configuration time we want to cache this if possible
@ -64,7 +69,8 @@ public class ParallelDetector {
ByteArrayOutputStream stdout = new ByteArrayOutputStream(); ByteArrayOutputStream stdout = new ByteArrayOutputStream();
// On Apple silicon, we only want to use the performance cores // On Apple silicon, we only want to use the performance cores
String query = project.getProviders().systemProperty("os.arch").getOrElse("").equals("aarch64") boolean isAppleSilicon = project.getProviders().systemProperty("os.arch").getOrElse("").equals("aarch64");
String query = isAppleSilicon && isMontereyOrNewer(project.getProviders())
? "hw.perflevel0.physicalcpu" ? "hw.perflevel0.physicalcpu"
: "hw.physicalcpu"; : "hw.physicalcpu";
@ -90,4 +96,15 @@ public class ParallelDetector {
return providers.systemProperty("os.name").getOrElse("").startsWith("Mac"); return providers.systemProperty("os.name").getOrElse("").startsWith("Mac");
} }
private static boolean isMontereyOrNewer(ProviderFactory providers) {
String rawVersion = providers.systemProperty("os.version").getOrElse("").trim();
if (rawVersion.isEmpty()) {
LOGGER.warn("Failed to validate MacOs version.");
return false;
}
String majorVersion = rawVersion.split("\\.")[0];
return Integer.parseInt(majorVersion) >= MACOS_MONTEREY_MAJOR_VERSION;
}
} }