DAOS-16686 dfuse: Improve concurrent overlapping read handling

site_scons/prereq_tools/base.py

@@ -206,7 +206,9 @@ def run_commands(self, commands, subdir=None, env=None):
                 retval = True
             else:
                 print(f"RUN: {' '.join(cmd)}")
-                if subprocess.call(cmd, shell=False, cwd=subdir, env=passed_env['ENV']) != 0:
+                rc = subprocess.call(cmd, shell=False, cwd=subdir, env=passed_env['ENV'])
+                if rc != 0:
+                    print(f"Command failed with {rc}")
                     retval = False
                     break
         return retval
@@ -1418,7 +1420,10 @@ def _patch_rpaths(self):
                 full_lib = os.path.join(path, lib)
                 cmd = ['patchelf', '--set-rpath', ':'.join(rpath), full_lib]
                 if not RUNNER.run_commands([cmd]):
-                    print(f'Skipped patching {full_lib}')
+                    if lib == 'libspdk.so':
+                        print(f'Skipped patching {full_lib}')
+                    else:
+                        raise BuildFailure(f"Failed to patch {lib}")
 
     def build(self, env, needed_libs):
         """Build the component, if necessary

src/client/dfuse/dfuse.h

@@ -399,6 +399,13 @@ struct dfuse_event {
 	d_iov_t          de_iov;
 	d_sg_list_t      de_sgl;
 	d_list_t         de_list;
+
+	/* Position in a list of events, this will either be off active->open_reads or
+	 * de->de_read_slaves.
+	 */
+	d_list_t         de_read_list;
+	/* List of slave events */
+	d_list_t         de_read_slaves;
 	struct dfuse_eq *de_eqt;
 	union {
 		struct dfuse_obj_hdl     *de_oh;
@@ -1016,8 +1023,11 @@ struct dfuse_inode_entry {
 };
 
 struct active_inode {
-	d_list_t               chunks;
-	pthread_spinlock_t     lock;
+	d_list_t           chunks;
+	size_t             file_size;
+	bool               seen_eof;
+	d_list_t           open_reads;
+	pthread_spinlock_t lock;
 	struct dfuse_pre_read *readahead;
 };
 
@@ -1133,7 +1143,7 @@ dfuse_cache_evict_dir(struct dfuse_info *dfuse_info, struct dfuse_inode_entry *i
  * Returns true if feature was used.
  */
 bool
-read_chunk_close(struct dfuse_inode_entry *ie);
+read_chunk_close(struct active_inode *active);
 
 /* Metadata caching functions. */
 

src/client/dfuse/dfuse_core.c

@@ -1318,6 +1318,8 @@ dfuse_read_event_size(void *arg, size_t size)
 		ev->de_sgl.sg_nr       = 1;
 	}
 
+	D_INIT_LIST_HEAD(&ev->de_read_slaves);
+
 	rc = daos_event_init(&ev->de_ev, ev->de_eqt->de_eq, NULL);
 	if (rc != -DER_SUCCESS) {
 		return false;

src/client/dfuse/file.c

@@ -41,6 +41,7 @@ active_ie_init(struct dfuse_inode_entry *ie, bool *preread)
 		goto out;
 	}
 	D_INIT_LIST_HEAD(&ie->ie_active->chunks);
+	D_INIT_LIST_HEAD(&ie->ie_active->open_reads);
 	if (preread && *preread) {
 		D_ALLOC_PTR(ie->ie_active->readahead);
 		if (ie->ie_active->readahead) {
@@ -96,7 +97,7 @@ active_oh_decref(struct dfuse_info *dfuse_info, struct dfuse_obj_hdl *oh)
 	if (oc != 1)
 		goto out;
 
-	rcb = read_chunk_close(oh->doh_ie);
+	rcb = read_chunk_close(oh->doh_ie->ie_active);
 
 	ah_free(dfuse_info, oh->doh_ie);
 out:
@@ -118,7 +119,7 @@ active_ie_decref(struct dfuse_info *dfuse_info, struct dfuse_inode_entry *ie)
 	if (oc != 1)
 		goto out;
 
-	read_chunk_close(ie);
+	read_chunk_close(ie->ie_active);
 
 	ah_free(dfuse_info, ie);
 out: