Fix s3-4c implementation (#247)
* Ported S3-4c version to current AIORI interface. * S3-4c: add crypto dependency * S3: Store username/host in options.master
parent
4e2d179052
commit
af2429b47e
|
@ -105,6 +105,7 @@ extraLDADD += -lcurl
|
||||||
extraLDADD += -lxml2
|
extraLDADD += -lxml2
|
||||||
extraLDADD += -laws4c
|
extraLDADD += -laws4c
|
||||||
extraLDADD += -laws4c_extra
|
extraLDADD += -laws4c_extra
|
||||||
|
extraLDADD += -lcrypto
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if USE_S3_LIBS3_AIORI
|
if USE_S3_LIBS3_AIORI
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -246,7 +246,6 @@ void init_IOR_Param_t(IOR_param_t * p)
|
||||||
p->hdfs_block_size = 0;
|
p->hdfs_block_size = 0;
|
||||||
|
|
||||||
p->URI = NULL;
|
p->URI = NULL;
|
||||||
p->part_number = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -168,9 +168,7 @@ typedef struct
|
||||||
int hdfs_block_size; /* internal blk-size. (0 gets default) */
|
int hdfs_block_size; /* internal blk-size. (0 gets default) */
|
||||||
|
|
||||||
char* URI; /* "path" to target object */
|
char* URI; /* "path" to target object */
|
||||||
size_t part_number; /* multi-part upload increment (PER-RANK!) */
|
|
||||||
char* UploadId; /* key for multi-part-uploads */
|
|
||||||
|
|
||||||
/* RADOS variables */
|
/* RADOS variables */
|
||||||
rados_t rados_cluster; /* RADOS cluster handle */
|
rados_t rados_cluster; /* RADOS cluster handle */
|
||||||
rados_ioctx_t rados_ioctx; /* I/O context for our pool in the RADOS cluster */
|
rados_ioctx_t rados_ioctx; /* I/O context for our pool in the RADOS cluster */
|
||||||
|
|
Loading…
Reference in New Issue