onedev/k8s-helper

Synchronized cache directory creation
Robin Shen committed 3 years ago

c64e3fc3

1 parent 6944b985
Release

Total 1 files

■ ■ ■ ■ ■ ■

src/main/java/io/onedev/k8shelper/KubernetesHelper.java

		skipped 75 lines
76	76
77	77		private static final Logger logger = LoggerFactory.getLogger(KubernetesHelper.class);
78	78
	79	+	private static final Object cacheHomeCreationLock = new Object();
	80	+
79	81		private static File getBuildHome() {
80	82		if (isWindows())
81	83		return new File("C:\\onedev-build");
		skipped 13 lines
95	97		}
96	98
97	99		private static File getCacheHome() {
	100	+	File file;
98	101		if (isWindows())
99		-	return new File("C:\\onedev-build\\cache");
	102	+	file = new File("C:\\onedev-build\\cache");
100	103		else
101		-	return new File("/onedev-build/cache");
	104	+	file = new File("/onedev-build/cache");
	105	+	if (!file.exists()) synchronized (cacheHomeCreationLock) {
	106	+	FileUtils.createDir(file);
	107	+	}
	108	+	return file;
102	109		}
103	110
104	111		private static File getWorkspace() {
		skipped 243 lines
348	355		FileUtils.createDir(getCommandHome());
349	356		FileUtils.createDir(getMarkHome());
350	357		if (test) {
351		-	logger.info("Testing server connectivity with '{}'...", serverUrl);
	358	+	logger.info("Connecting to server '{}'...", serverUrl);
352	359		WebTarget target = client.target(serverUrl).path("api/k8s/test");
353	360		Invocation.Builder builder = target.request();
354	361		builder.header(HttpHeaders.AUTHORIZATION, BEARER + " " + jobToken);
		skipped 210 lines
565	572		infoLogger.consume(line);
566	573		}
567	574
568		-	}, errorLogger).checkReturnCode();
	575	+	}, new LineConsumer() {
	576	+
	577	+	@Override
	578	+	public void consume(String line) {
	579	+	if (!line.startsWith("hint:"))
	580	+	errorLogger.consume(line);
	581	+	}
	582	+
	583	+	}).checkReturnCode();
569	584		}
570	585		}
571	586
		skipped 284 lines
856	871		TaskLogger logger = new TaskLogger() {
857	872
858	873		@Override
859		-	public void log(String message, String taskId) {
	874	+	public void log(String message, String sessionId) {
860	875		KubernetesHelper.logger.info(message);
861	876		}
862	877
		skipped 132 lines

Synchronized cache directory creation