diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc
index ee6e634fa113..7a4d7009f96e 100644
--- a/storage/innobase/buf/buf0dblwr.cc
+++ b/storage/innobase/buf/buf0dblwr.cc
@@ -658,7 +658,7 @@ buf_dblwr_init_or_load_pages(
 
 		os_file_set_nocache(parallel_dblwr_buf.file,
 				    parallel_dblwr_buf.path,
-				    "open");
+				    "open", false);
 
 		os_offset_t size = os_file_get_size(parallel_dblwr_buf.file);
 
@@ -1262,21 +1262,8 @@ buf_dblwr_flush_buffered_writes(
 	srv_stats.dblwr_pages_written.add(dblwr_shard->first_free);
 	srv_stats.dblwr_writes.inc();
 
-	/* Now flush the doublewrite buffer data to disk, unless
-	innodb_flush_method is one of O_SYNC, O_DIRECT_NO_FSYNC, or
-	ALL_O_DIRECT. */
-	switch (srv_unix_file_flush_method) {
-	case SRV_UNIX_NOSYNC:
-	case SRV_UNIX_O_DSYNC:
-	case SRV_UNIX_O_DIRECT_NO_FSYNC:
-	case SRV_UNIX_ALL_O_DIRECT:
-		break;
-	case SRV_UNIX_FSYNC:
-	case SRV_UNIX_LITTLESYNC:
-	case SRV_UNIX_O_DIRECT:
+	if (parallel_dblwr_buf.needs_flush)
 		os_file_flush(parallel_dblwr_buf.file);
-		break;
-	}
 
 	/* We know that the writes have been flushed to disk now
 	and in recovery we will find them in the doublewrite buffer
@@ -1530,8 +1517,23 @@ buf_parallel_dblwr_file_create(void)
 		return(DB_ERROR);
 	}
 
-	os_file_set_nocache(parallel_dblwr_buf.file, parallel_dblwr_buf.path,
-			    "create");
+	const bool o_direct_set
+		= os_file_set_nocache(parallel_dblwr_buf.file,
+				      parallel_dblwr_buf.path,
+				      "create", false);
+	switch (srv_unix_file_flush_method) {
+	case SRV_UNIX_NOSYNC:
+	case SRV_UNIX_O_DSYNC:
+	case SRV_UNIX_O_DIRECT_NO_FSYNC:
+	case SRV_UNIX_ALL_O_DIRECT:
+		parallel_dblwr_buf.needs_flush = !o_direct_set;
+		break;
+	case SRV_UNIX_FSYNC:
+	case SRV_UNIX_LITTLESYNC:
+	case SRV_UNIX_O_DIRECT:
+		parallel_dblwr_buf.needs_flush = true;
+		break;
+	}
 
 	success = os_file_set_size(parallel_dblwr_buf.path,
 				   parallel_dblwr_buf.file, size, false);
diff --git a/storage/innobase/include/buf0dblwr.h b/storage/innobase/include/buf0dblwr.h
index 2c5099ff2f3f..ea53cbef4ff3 100644
--- a/storage/innobase/include/buf0dblwr.h
+++ b/storage/innobase/include/buf0dblwr.h
@@ -199,6 +199,9 @@ class parallel_dblwr_t {
 public:
 	/** Parallel doublewrite buffer file handle */
 	pfs_os_file_t		file;
+	/** Whether the doublewrite buffer file needs flushing after each
+	write */
+	bool			needs_flush;
 	/** Path to the parallel doublewrite buffer */
 	char*			path;
 	/** Individual parallel doublewrite partitions */
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
index 4e668195cd17..401ab67415f2 100644
--- a/storage/innobase/include/os0file.h
+++ b/storage/innobase/include/os0file.h
@@ -1059,25 +1059,31 @@ os_file_create_simple_no_error_handling_func(
 @param[in]	file_name	file name, used in the diagnostic message
 @param[in]	name		"open" or "create"; used in the diagnostic
 				message
+@param[in]	failure_warning	if true (the default), the failure to disable
+caching is diagnosed at warning severity, and at note severity otherwise
 @return true if operation is success and false */
 bool
 os_file_set_nocache(
 	int		fd,
 	const char*	file_name,
-	const char*	operation_name);
+	const char*	operation_name,
+	bool		failure_warning = true);
 
 /** Tries to disable OS caching on an opened file file.
 @param[in]	file		file to alter
 @param[in]	file_name	file name, used in the diagnostic message
 @param[in]	name		"open" or "create"; used in the diagnostic
 message
+@param[in]	failure_warning	if true (the default), the failure to disable
+caching is diagnosed at warning severity, and at note severity otherwise
 @return true if operation is success and false */
 UNIV_INLINE
 bool
 os_file_set_nocache(
 	pfs_os_file_t	file,
 	const char*	file_name,
-	const char*	operation_name);
+	const char*	operation_name,
+	bool		failure_warning = true);
 
 /** NOTE! Use the corresponding macro os_file_create(), not directly
 this function!
diff --git a/storage/innobase/include/os0file.ic b/storage/innobase/include/os0file.ic
index bb60745407d5..6f126c75624f 100644
--- a/storage/innobase/include/os0file.ic
+++ b/storage/innobase/include/os0file.ic
@@ -673,13 +673,17 @@ pfs_os_file_set_eof_at_func(
 @param[in]	file_name	file name, used in the diagnostic message
 @param[in]	name		"open" or "create"; used in the diagnostic
 message
+@param[in]	failure_warning	if true (the default), the failure to disable
+caching is diagnosed at warning severity, and at note severity otherwise
 @return true if operation is success and false */
 UNIV_INLINE
 bool
 os_file_set_nocache(
 	pfs_os_file_t	file,
 	const char*	file_name,
-	const char*	operation_name)
+	const char*	operation_name,
+	bool		failure_warning)
 {
-	return os_file_set_nocache(file.m_file, file_name, operation_name);
+	return os_file_set_nocache(file.m_file, file_name, operation_name,
+				   failure_warning);
 }
diff --git a/storage/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index b8a6ba3b852f..50d85fc44d26 100644
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -614,6 +614,19 @@ class fatal_or_error : public logger {
 	const bool	m_fatal;
 };
 
+/** Emit a warning message if the given predicate is true, otherwise emit an
+informational message. */
+class warn_or_info : public logger {
+public:
+	warn_or_info(bool	pred)
+	: m_warn(pred)
+	{}
+
+	~warn_or_info();
+private:
+	const bool	m_warn;
+};
+
 } // namespace ib
 
 #ifndef UNIV_NONINL
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index 98602c092ba8..9e56f84fbe57 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -3706,9 +3706,8 @@ os_file_create_func(
 	} else if (!srv_read_only_mode
 		   && *success
 		   && srv_unix_file_flush_method == SRV_UNIX_ALL_O_DIRECT) {
-		/* Do fsync() on log and parallel doublewrite files
-		when setting O_DIRECT fails.
-		See log_io_complete() and buf_dblwr_flush_buffered_writes() */
+		/* Do fsync() on log and files when setting O_DIRECT fails.
+		See log_io_complete() */
 		if (!os_file_set_nocache(file.m_file, name, mode_str)) {
 			srv_unix_file_flush_method = SRV_UNIX_O_DIRECT;
 		}
@@ -6010,12 +6009,15 @@ os_file_handle_error_no_exit(
 @param[in]	file_name	file name, used in the diagnostic message
 @param[in]	name		"open" or "create"; used in the diagnostic
 				message
+@param[in]	failure_warning	if true (the default), the failure to disable
+caching is diagnosed at warning severity, and at note severity otherwise
 @return true if operation is success and false */
 bool
 os_file_set_nocache(
 	int		fd		MY_ATTRIBUTE((unused)),
 	const char*	file_name	MY_ATTRIBUTE((unused)),
-	const char*	operation_name	MY_ATTRIBUTE((unused)))
+	const char*	operation_name	MY_ATTRIBUTE((unused)),
+	bool		failure_warning MY_ATTRIBUTE((unused)))
 {
 	/* some versions of Solaris may not have DIRECTIO_ON */
 #if defined(UNIV_SOLARIS) && defined(DIRECTIO_ON)
@@ -6037,8 +6039,8 @@ os_file_set_nocache(
 			if (!warning_message_printed) {
 				warning_message_printed = true;
 # ifdef UNIV_LINUX
-				ib::warn()
-					<< "Failed to set O_DIRECT on file"
+				ib::warn_or_info(failure_warning)
+					<< "Failed to set O_DIRECT on file "
 					<< file_name << ";" << operation_name
 					<< ": " << strerror(errno_save) << ", "
 					<< "continuing anyway. O_DIRECT is "
@@ -6053,7 +6055,7 @@ os_file_set_nocache(
 # ifndef UNIV_LINUX
 short_warning:
 # endif
-			ib::warn()
+			ib::warn_or_info(failure_warning)
 				<< "Failed to set O_DIRECT on file "
 				<< file_name << "; " << operation_name
 				<< " : " << strerror(errno_save)
diff --git a/storage/innobase/ut/ut0ut.cc b/storage/innobase/ut/ut0ut.cc
index 4f3d68d2dea8..7f742433f639 100644
--- a/storage/innobase/ut/ut0ut.cc
+++ b/storage/innobase/ut/ut0ut.cc
@@ -932,6 +932,15 @@ fatal_or_error::~fatal_or_error()
 	ut_a(!m_fatal);
 }
 
+warn_or_info::~warn_or_info()
+{
+	if (m_warn) {
+		sql_print_warning("InnoDB: %s", m_oss.str().c_str());
+	} else {
+		sql_print_information("InnoDB: %s", m_oss.str().c_str());
+	}
+}
+
 } // namespace ib
 
 #endif /* !UNIV_INNOCHECKSUM */