set indexlabel invalid if create or rebuild failed

hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java

@@ -370,7 +370,7 @@ public IdHolderList queryIndex(ConditionQuery query) {
     private IdHolderList queryByLabel(ConditionQuery query) {
         HugeType queryType = query.resultType();
         IndexLabel il = IndexLabel.label(queryType);
-        validIndexLabel(il);
+        validateIndexLabel(il);
         Id label = query.condition(HugeKeys.LABEL);
         assert label != null;
 
@@ -429,7 +429,7 @@ private IdHolderList queryByUserprop(ConditionQuery query) {
         IdHolderList holders = new IdHolderList(paging);
         for (MatchedIndex index : indexes) {
             for (IndexLabel il : index.indexLabels()) {
-                validIndexLabel(il);
+                validateIndexLabel(il);
             }
             if (paging && index.indexLabels().size() > 1) {
                 throw new NotSupportException("joint index query in paging");
@@ -1354,10 +1354,10 @@ private static NoIndexException noIndexException(HugeGraph graph,
                                     name, String.join("/", mismatched));
     }
 
-    private static void validIndexLabel(IndexLabel indexLabel) {
+    private static void validateIndexLabel(IndexLabel indexLabel) {
         if (indexLabel.status() == SchemaStatus.INVALID) {
-            throw new HugeException("The label index %s is invalid",
-                                    indexLabel);
+            throw new HugeException("Can't query by label index '%s' due to " +
+                                    "it is in invalid status", indexLabel);
         }
     }
 

hugegraph-core/src/main/java/com/baidu/hugegraph/job/schema/RebuildIndexCallable.java

@@ -134,11 +134,11 @@ private void rebuildIndex(SchemaLabel label, Collection<Id> indexLabelIds) {
                                                  consumer, false);
                 }
                 graphTx.commit();
-            } catch (Throwable t) {
+            } catch (Throwable e) {
                 for (IndexLabel il : ils) {
                     schemaTx.updateSchemaStatus(il, SchemaStatus.INVALID);
                 }
-                throw t;
+                throw e;
             }
 
             for (IndexLabel il : ils) {
@@ -166,9 +166,9 @@ private void removeIndex(Collection<Id> indexLabelIds) {
             try {
                 locks.lockWrites(LockUtil.INDEX_LABEL_DELETE, indexLabelIds);
                 graphTx.removeIndex(il);
-            } catch (Throwable t) {
-                il.status(SchemaStatus.INVALID);
-                throw t;
+            } catch (Throwable e) {
+                schemaTx.updateSchemaStatus(il, SchemaStatus.INVALID);
+                throw e;
             } finally {
                 locks.unlock();
             }

hugegraph-core/src/main/java/com/baidu/hugegraph/schema/builder/IndexLabelBuilder.java

@@ -222,18 +222,18 @@ public IndexLabel.CreatedIndexLabel createWithTask() {
 
             // Create index label (just schema)
             indexLabel.status(SchemaStatus.CREATING);
+            this.graph().addIndexLabel(schemaLabel, indexLabel);
             try {
-                this.graph().addIndexLabel(schemaLabel, indexLabel);
-
                 // Async rebuild index
                 Id rebuildTask = this.rebuildIndex(indexLabel, removeTasks);
                 E.checkNotNull(rebuildTask, "rebuild-index task");
 
                 return new IndexLabel.CreatedIndexLabel(indexLabel,
                                                         rebuildTask);
-            } catch (Throwable t) {
+            } catch (Throwable e) {
                 indexLabel.status(SchemaStatus.INVALID);
-                throw t;
+                this.graph().addIndexLabel(schemaLabel, indexLabel);
+                throw e;
             }
         });
     }