Log error cause when opcache cannot write to file cache

Author: arnaud-lb

ext/opcache/tests/file_cache_error.inc

@@ -0,0 +1,3 @@
+<?php
+
+echo "OK\n";

ext/opcache/tests/file_cache_error.phpt

@@ -0,0 +1,18 @@
+--TEST--
+File cache error 001
+--EXTENSIONS--
+opcache
+posix
+--INI--
+opcache.enable_cli=1
+opcache.file_cache={PWD}
+opcache.log_verbosity_level=2
+--FILE--
+<?php
+posix_setrlimit(POSIX_RLIMIT_FSIZE, 1, 1);
+require __DIR__.'/file_cache_error.inc';
+?>
+--EXPECTF--
+%sWarning opcache cannot write to file %s: %s
+
+OK

ext/opcache/zend_file_cache.c

@@ -1004,23 +1004,55 @@ static char *zend_file_cache_get_bin_file_path(zend_string *script_path)
 /**
  * Helper function for zend_file_cache_script_store().
  *
- * @return true on success, false on error
+ * @return true on success, false on error and errno is set to indicate the cause of the error
  */
 static bool zend_file_cache_script_write(int fd, const zend_persistent_script *script, const zend_file_cache_metainfo *info, const void *buf, const zend_string *s)
 {
+	ssize_t written;
+
 #ifdef HAVE_SYS_UIO_H
 	const struct iovec vec[] = {
 		{ .iov_base = (void *)info, .iov_len = sizeof(*info) },
 		{ .iov_base = (void *)buf, .iov_len = script->size },
 		{ .iov_base = (void *)ZSTR_VAL(s), .iov_len = info->str_size },
 	};
 
-	return writev(fd, vec, sizeof(vec) / sizeof(vec[0])) == (ssize_t)(sizeof(*info) + script->size + info->str_size);
+	written = writev(fd, vec, sizeof(vec) / sizeof(vec[0]));
+	if (EXPECTED(written == (ssize_t)(sizeof(*info) + script->size + info->str_size))) {
+		return true;
+	}
+
+	errno = written == -1 ? errno : EAGAIN;
+	return false;
 #else
-	return ZEND_LONG_MAX >= (zend_long)(sizeof(*info) + script->size + info->str_size) &&
-		write(fd, info, sizeof(*info)) == sizeof(*info) &&
-		write(fd, buf, script->size) == script->size &&
-		write(fd, ZSTR_VAL(s), info->str_size) == info->str_size;
+	if (UNEXPECTED(ZEND_LONG_MAX >= (zend_long)(sizeof(*info) + script->size + info->str_size))) {
+# ifdef EFBIG
+		errno = EFBIG;
+# else
+		errno = ERANGE;
+# endif
+		return false;
+	}
+
+	written = write(fd, info, sizeof(*info));
+	if (UNEXPECTED(written != sizeof(*info))) {
+		errno = written == -1 ? errno : EAGAIN;
+		return false;
+	}
+
+	written = write(fd, buf, script->size);
+	if (UNEXPECTED(written != script->size)) {
+		errno = written == -1 ? errno : EAGAIN;
+		return false;
+	}
+
+	written = write(fd, ZSTR_VAL(s), info->str_size);
+	if (UNEXPECTED(writen != info->str_size)) {
+		errno = written == -1 ? errno : EAGAIN;
+		return false;
+	}
+
+	return true;
 #endif
 }
 
@@ -1095,7 +1127,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, bool in_shm)
 #endif
 
 	if (!zend_file_cache_script_write(fd, script, &info, buf, s)) {
-		zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot write to file '%s'\n", filename);
+		zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot write to file '%s': %s\n", filename, strerror(errno));
 		zend_string_release_ex(s, 0);
 		close(fd);
 		efree(mem);
@@ -1107,7 +1139,7 @@ int zend_file_cache_script_store(zend_persistent_script *script, bool in_shm)
 	zend_string_release_ex(s, 0);
 	efree(mem);
 	if (zend_file_cache_flock(fd, LOCK_UN) != 0) {
-		zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot unlock file '%s'\n", filename);
+		zend_accel_error(ACCEL_LOG_WARNING, "opcache cannot unlock file '%s': %s\n", filename, strerror(errno));
 	}
 	close(fd);
 	efree(filename);