Merge pull request #454 from edgargabriel/pr/lustre-and-aggregatorlogic-fix

Pr/lustre and aggregatorlogic fix

Author: hppritcha

ompi/mca/fs/lustre/fs_lustre_file_get_size.c

@@ -33,9 +33,18 @@
  *	Returns:	- Success if size is get
  */
 int
-mca_fs_lustre_file_get_size (mca_io_ompio_file_t *file_handle,
+mca_fs_lustre_file_get_size (mca_io_ompio_file_t *fh,
                          OMPI_MPI_OFFSET_TYPE *size)
 {
-    printf ("LUSTRE GET SIZE\n");
+    *size = lseek(fh->fd, 0, SEEK_END);
+    if (-1 == *size) {
+        perror ("lseek");
+        return OMPI_ERROR;
+    }
+
+    if (-1 == (lseek(fh->fd, fh->f_offset, SEEK_SET))) {
+        perror ("lseek");
+        return OMPI_ERROR;
+    }
     return OMPI_SUCCESS;
 }

ompi/mca/fs/lustre/fs_lustre_file_open.c

@@ -40,6 +40,19 @@
  *	Accepts:	- same arguments as MPI_File_open()
  *	Returns:	- Success if new file handle
  */
+static void *alloc_lum()
+{
+  int v1, v3, join;
+
+  v1 = sizeof(struct lov_user_md_v1) +
+    LOV_MAX_STRIPE_COUNT * sizeof(struct lov_user_ost_data_v1);
+  v3 = sizeof(struct lov_user_md_v3) +
+    LOV_MAX_STRIPE_COUNT * sizeof(struct lov_user_ost_data_v1);
+
+  return malloc(MAX(v1, v3));
+}
+
+
 int
 mca_fs_lustre_file_open (struct ompi_communicator_t *comm, 
                      char* filename,
@@ -97,7 +110,6 @@ mca_fs_lustre_file_open (struct ompi_communicator_t *comm,
         fs_lustre_stripe_width = mca_fs_lustre_stripe_width;
     }
 
-
     if ( (fs_lustre_stripe_size>0 || fs_lustre_stripe_width>0) &&
         (amode&O_CREAT) && (amode&O_RDWR)) {
         if (0 == fh->f_rank) {
@@ -121,24 +133,29 @@ mca_fs_lustre_file_open (struct ompi_communicator_t *comm,
 
     fh->fd = open (filename, amode, perm);
     if (fh->fd < 0) {
+        opal_output(1, "error opening file %s\n", filename);
         return OMPI_ERROR;
     }
 
     if (mca_fs_lustre_stripe_size > 0) {
         fh->f_stripe_size = mca_fs_lustre_stripe_size;
     }
     else {
-      lump = (struct lov_user_md  *) malloc (sizeof(struct lov_user_md));
+      lump = alloc_lum();
       if (NULL == lump ){
 	fprintf(stderr,"Cannot allocate memory for extracting stripe size\n");
 	return OMPI_ERROR;
       }
       rc = llapi_file_get_stripe(filename, lump);
       if (rc != 0) {
-	  fprintf(stderr, "get_stripe failed: %d (%s)\n",errno, strerror(errno));
+          opal_output(1, "get_stripe failed: %d (%s)\n", errno, strerror(errno));
 	  return OMPI_ERROR;
       }
       fh->f_stripe_size = lump->lmm_stripe_size;
+
+      //      if ( NULL != lump ) {
+      //	free ( lump );
+      //      }
     }
     return OMPI_SUCCESS;
 }

ompi/mca/fs/lustre/fs_lustre_file_set_size.c

@@ -33,9 +33,21 @@
  *	Returns:	- Success if size is set
  */
 int
-mca_fs_lustre_file_set_size (mca_io_ompio_file_t *file_handle,
+mca_fs_lustre_file_set_size (mca_io_ompio_file_t *fh,
                          OMPI_MPI_OFFSET_TYPE size)
 {
-    printf ("LUSTRE SET SIZE\n");
+    int err = 0;
+
+    err = ftruncate(fh->fd, size);
+
+    fh->f_comm->c_coll.coll_bcast (&err,
+                                   1,
+                                   MPI_INT,
+                                   OMPIO_ROOT,
+                                   fh->f_comm,
+                                   fh->f_comm->c_coll.coll_bcast_module);
+    if (-1 == err) {
+        return OMPI_ERROR;
+    }
     return OMPI_SUCCESS;
 }

ompi/mca/io/ompio/io_ompio.c

@@ -1053,6 +1053,7 @@ int ompi_io_ompio_set_aggregator_props (struct mca_io_ompio_file_t *fh,
     }
 
     fh->f_aggregator_index = 0;
+    fh->f_final_num_aggrs  = num_aggregators;
 
     return OMPI_SUCCESS;
    }