Update PR to work around the create bucket mandatory quota setting

The CloudStack UI and API now require a quota setting to be configured
on all buckets. HyperStore does not support a bucket quota limit
setting. As a work around, this commit allows a quota setting of 0
to indicate there is no quota limit. Any other non-zero value will
cause the quota setting to fail.

HyperStore may add a bucket quota limit setting in a future version
at which time we will address this further.

Additionally fix pom to update version

Author: tpodowd

plugins/storage/object/cloudian/README.md

@@ -20,12 +20,12 @@ Cloudian HyperStore is a fully AWS-S3 compatible Object Storage solution. The fo
 
 1. Enable Bucket Usage Statistics
 
-   Bucket Level QoS settings must be set to true. On HyperStore 8+, this can be done as follows. Earlier versions require puppet configuration not documented here.
+   Bucket Level QoS settings must be set to true. On HyperStore 8+, this can be done as follows. Earlier versions require puppet configuration which is not documented here.
 
    ```shell
    hsh$ hsctl config set s3.qos.bucketLevel=true
-   hsh$ hsctl config apply s3
-   hsh$ hsctl service restart --nodes=ALL
+   hsh$ hsctl config apply s3 cmc
+   hsh$ hsctl service restart s3 cmc --nodes=ALL
    ```
 
 2. The Admin API Username and Password
@@ -104,7 +104,7 @@ The following are noteworthy.
 
 ### Bucket Quota is Unsupported
 
-This operation is not supported by this plugin. Cloudian HyperStore does not currently support restricting the size of a bucket to a particular quota.
+Cloudian HyperStore does not currently support restricting the size of a bucket to a particular quota limit. The plugin accepts a quota value of 0 to indicate no quota setting. When creating a bucket in the CloudStack UI, the user is required to set a quota of 0. Any other value will fail.
 
 ### Bucket Usage
 

plugins/storage/object/cloudian/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack-plugins</artifactId>
-        <version>4.20.0.0-SNAPSHOT</version>
+        <version>4.21.0.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <dependencies>

plugins/storage/object/cloudian/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudianHyperStoreObjectStoreDriverImpl.java

@@ -728,17 +728,27 @@ public boolean deleteBucketVersioning(BucketTO bucket, long storeId) {
     }
 
     /**
-     * Set the bucket quota to size bytes.
+     * Set the bucket quota to a size limit specified in GiB.
+     *
+     * Cloudian HyperStore does not currently support bucket quota limits.
+     * CloudStack itself requires a quota to be set. HyperStore may add
+     * Bucket Quota support in a future version. Currently, we only support
+     * setting the quota to zero to indicate no quota.
+     *
      * @param bucket the bucket
      * @param storeId the store
-     * @param size the GB (1000^3) size to set the quota to.
-     * @throws CloudRuntimeException is always thrown as Cloudian does not currently
-     *         implement bucket quotas.
+     * @param size the GiB (1024^3) size to set the quota to. Only 0 is supported.
+     * @throws CloudRuntimeException is thrown for any other value other than 0.
      */
     @Override
     public void setBucketQuota(BucketTO bucket, long storeId, long size) {
-        logger.warn("Unable to set quota for bucket \"{}\" to {}GB. Cloudian does not implement Bucket Quota.", bucket.getName(), size);
-        throw new CloudRuntimeException("This bucket does not support quotas.");
+        if (size == 0) {
+            logger.debug("Bucket \"{}\" quota set to 0 (no quota).", bucket.getName());
+            return;
+        }
+        // Any other setting, throw an exception.
+        logger.warn("Unable to set quota for bucket \"{}\" to {}GiB. Only 0 is supported.", bucket.getName(), size);
+        throw new CloudRuntimeException("This bucket does not support a quota. Use 0 to specify no quota.");
     }
 
     /**

plugins/storage/object/cloudian/src/test/java/org/apache/cloudstack/storage/datastore/driver/CloudianHyperStoreObjectStoreDriverImplTest.java

@@ -556,11 +556,18 @@ public void testSetBucketPolicyPublic() throws Exception {
     }
 
     @Test(expected = CloudRuntimeException.class)
-    public void testSetBucketQuota() {
+    public void testSetBucketQuotaNonZero() {
         BucketTO bucket = mock(BucketTO.class);
         when(bucket.getName()).thenReturn(TEST_BUCKET_NAME);
-        // Quota is not implemented by HyperStore, we throw an CloudRuntimeException.
-        cloudianHyperStoreObjectStoreDriverImpl.setBucketQuota(bucket, TEST_STORE_ID, 5000L);
+        // Quota is not implemented by HyperStore. Throws a CloudRuntimeException if not 0.
+        cloudianHyperStoreObjectStoreDriverImpl.setBucketQuota(bucket, TEST_STORE_ID, 5L);
+    }
+
+    public void testSetBucketQuotaToZero() {
+        BucketTO bucket = mock(BucketTO.class);
+        when(bucket.getName()).thenReturn(TEST_BUCKET_NAME);
+        // A zero quota indicates no quota and should be an accepted value.
+        cloudianHyperStoreObjectStoreDriverImpl.setBucketQuota(bucket, TEST_STORE_ID, 0);
     }
 
     @Test