More logging in delete entries + returns a long instead of int

hi-27 · May 12, 2011 · ff623f5 · ff623f5
1 parent 78a2fbf
commit ff623f5
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 30 deletions.
diff --git a/clients/python/voldemort/protocol/voldemort_admin_pb2.py b/clients/python/voldemort/protocol/voldemort_admin_pb2.py
diff --git a/src/java/voldemort/client/protocol/admin/AdminClient.java b/src/java/voldemort/client/protocol/admin/AdminClient.java
@@ -1078,10 +1078,10 @@ private VAdminProto.VoldemortFilter encodeFilter(VoldemortFilter filter) throws
      *        should not be deleted.
      * @return Number of entries deleted
      */
-    public int deletePartitions(int nodeId,
-                                String storeName,
-                                List<Integer> partitionList,
-                                VoldemortFilter filter) {
+    public long deletePartitions(int nodeId,
+                                 String storeName,
+                                 List<Integer> partitionList,
+                                 VoldemortFilter filter) {
         return deletePartitions(nodeId,
                                 storeName,
                                 getReplicaToPartitionMap(nodeId, storeName, partitionList),
@@ -1100,11 +1100,11 @@ public int deletePartitions(int nodeId,
      *        should not be deleted.
      * @return Number of entries deleted
      */
-    public int deletePartitions(int nodeId,
-                                String storeName,
-                                HashMap<Integer, List<Integer>> replicaToPartitionList,
-                                Cluster initialCluster,
-                                VoldemortFilter filter) {
+    public long deletePartitions(int nodeId,
+                                 String storeName,
+                                 HashMap<Integer, List<Integer>> replicaToPartitionList,
+                                 Cluster initialCluster,
+                                 VoldemortFilter filter) {
         VAdminProto.DeletePartitionEntriesRequest.Builder deleteRequest = VAdminProto.DeletePartitionEntriesRequest.newBuilder()
                                                                                                                    .addAllReplicaToPartition(ProtoUtils.encodePartitionTuple(replicaToPartitionList))
                                                                                                                    .setStore(storeName);

diff --git a/src/java/voldemort/client/protocol/pb/VAdminProto.java b/src/java/voldemort/client/protocol/pb/VAdminProto.java
diff --git a/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java b/src/java/voldemort/server/protocol/admin/AdminServiceRequestHandler.java
@@ -688,8 +688,10 @@ public void operate() {
                         if(isReadOnlyStore) {
                             ReadOnlyStorageEngine readOnlyStorageEngine = ((ReadOnlyStorageEngine) storageEngine);
                             String destinationDir = readOnlyStorageEngine.getCurrentDirPath();
-                            updateStatus("Initated fetching of files for RO store " + storeName
-                                         + " from node " + nodeId);
+                            logger.info("Fetching files for RO store " + storeName + " from node "
+                                        + nodeId);
+                            updateStatus("Fetching files for RO store " + storeName + " from node "
+                                         + nodeId);
                             adminClient.fetchPartitionFiles(nodeId,
                                                             storeName,
                                                             replicaToPartitionList,
@@ -699,7 +701,9 @@ public void operate() {
                                                                                  .keySet());
 
                         } else {
-                            updateStatus("Initated fetching of entries for RW store " + storeName
+                            logger.info("Fetching entries for RW store " + storeName
+                                        + " from node " + nodeId);
+                            updateStatus("Fetching entries for RW store " + storeName
                                          + " from node " + nodeId);
                             Iterator<Pair<ByteArray, Versioned<byte[]>>> entriesIterator = adminClient.fetchEntries(nodeId,
                                                                                                                     storeName,
@@ -722,7 +726,7 @@ public void operate() {
 
                                 throttler.maybeThrottle(key.length() + valueSize(value));
                                 if((i % 1000) == 0) {
-                                    updateStatus(i + " entries copied from " + nodeId
+                                    updateStatus(i + " entries copied from node " + nodeId
                                                  + " for store " + storeName);
                                 }
                             }
@@ -769,6 +773,17 @@ public VAdminProto.DeletePartitionEntriesResponse handleDeletePartitionEntries(V
         try {
             String storeName = request.getStore();
             final HashMap<Integer, List<Integer>> replicaToPartitionList = ProtoUtils.decodePartitionTuple(request.getReplicaToPartitionList());
+
+            final boolean isReadWriteStore = metadataStore.getStoreDef(storeName)
+                                                          .getType()
+                                                          .compareTo(ReadOnlyStorageConfiguration.TYPE_NAME) != 0;
+
+            if(!isReadWriteStore) {
+                throw new VoldemortException("Cannot delete partitions for store " + storeName
+                                             + " on node " + metadataStore.getNodeId()
+                                             + " since it is not a RW store");
+            }
+
             StorageEngine<ByteArray, byte[], byte[]> storageEngine = getStorageEngine(storeRepository,
                                                                                       storeName);
             VoldemortFilter filter = (request.hasFilter()) ? getFilterFromRequest(request.getFilter(),
@@ -777,7 +792,9 @@ public VAdminProto.DeletePartitionEntriesResponse handleDeletePartitionEntries(V
                                                           : new DefaultVoldemortFilter();
             EventThrottler throttler = new EventThrottler(voldemortConfig.getStreamMaxReadBytesPerSec());
             iterator = storageEngine.entries();
-            int deleteSuccess = 0;
+            long deleteSuccess = 0;
+            logger.info("Deleting entries for RW store " + storeName + " from node "
+                        + metadataStore.getNodeId());
 
             while(iterator.hasNext()) {
                 Pair<ByteArray, Versioned<byte[]>> entry = iterator.next();
@@ -792,10 +809,16 @@ public VAdminProto.DeletePartitionEntriesResponse handleDeletePartitionEntries(V
                                                                                         : metadataStore.getCluster(),
                                                              metadataStore.getStoreDef(storeName))
                    && filter.accept(key, value)) {
-                    if(storageEngine.delete(key, value.getVersion()))
+                    if(storageEngine.delete(key, value.getVersion())) {
                         deleteSuccess++;
+                        if((deleteSuccess % 1000) == 0) {
+                            logger.info(deleteSuccess + " entries deleted from node "
+                                        + metadataStore.getNodeId() + " for store " + storeName);
+                        }
+                    }
                 }
             }
+
             response.setCount(deleteSuccess);
         } catch(VoldemortException e) {
             response.setError(ProtoUtils.encodeError(errorCodeMapper, e));

diff --git a/src/proto/voldemort-admin.proto b/src/proto/voldemort-admin.proto
@@ -89,7 +89,7 @@ message DeletePartitionEntriesRequest {
 }
 
 message DeletePartitionEntriesResponse {
-  optional int32 count = 1;
+  optional int64 count = 1;
   optional Error error = 2;
 }
 

diff --git a/test/unit/voldemort/store/rebalancing/RebootstrappingStoreTest.java b/test/unit/voldemort/store/rebalancing/RebootstrappingStoreTest.java
@@ -115,7 +115,7 @@ public void rebalance() {
                                  node1.getSocketPort(),
                                  node1.getAdminPort(),
                                  ImmutableList.of(0, 1));
-        int deleted = adminClient.deletePartitions(0, STORE_NAME, ImmutableList.of(0, 1), null);
+        long deleted = adminClient.deletePartitions(0, STORE_NAME, ImmutableList.of(0, 1), null);
         assert deleted > 0;
         Cluster newCluster = new Cluster(cluster.getName(),
                                          ImmutableList.of(newNode0, newNode1),