This is an automated email from the ASF dual-hosted git repository.
wangchao316 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 117b35cebd6 Complete the log information for Some Procedure (#11554)
117b35cebd6 is described below
commit 117b35cebd63439b045773560033b172ed442878
Author: Bo Cui <[email protected]>
AuthorDate: Fri Nov 17 13:37:06 2023 +0800
Complete the log information for Some Procedure (#11554)
Complete the log information for Some Procedure (#11554)
---
.../confignode/procedure/impl/node/RemoveConfigNodeProcedure.java | 3 ++-
.../confignode/procedure/impl/schema/AlterLogicalViewProcedure.java | 6 ++----
.../procedure/impl/schema/DeleteLogicalViewProcedure.java | 6 ++----
.../confignode/procedure/impl/schema/SetTemplateProcedure.java | 6 ++----
.../confignode/procedure/impl/trigger/CreateTriggerProcedure.java | 4 ++--
.../confignode/procedure/impl/trigger/DropTriggerProcedure.java | 2 +-
6 files changed, 11 insertions(+), 16 deletions(-)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
index 69900fe9356..037509fb8cf 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/RemoveConfigNodeProcedure.java
@@ -76,7 +76,8 @@ public class RemoveConfigNodeProcedure extends
AbstractNodeProcedure<RemoveConfi
}
} catch (Exception e) {
if (isRollbackSupported(state)) {
- setFailure(new ProcedureException("Remove Config Node failed " +
state));
+ setFailure(
+ new ProcedureException("Remove Config Node" + removedConfigNode +
" failed " + state));
} else {
LOG.error(
"Retrievable error trying to remove config node {}, state {}",
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java
index 1a3a9ae2aab..be3eabb6e7a 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/AlterLogicalViewProcedure.java
@@ -106,14 +106,12 @@ public class AlterLogicalViewProcedure
}
return Flow.NO_MORE_STATE;
default:
- setFailure(new ProcedureException("Unrecognized state " +
state.toString()));
+ setFailure(new ProcedureException("Unrecognized state " + state));
return Flow.NO_MORE_STATE;
}
} finally {
LOGGER.info(
- String.format(
- "AlterLogicalView-[%s] costs %sms",
- state.toString(), (System.currentTimeMillis() - startTime)));
+ "AlterLogicalView-[{}] costs {}ms", state,
(System.currentTimeMillis() - startTime));
}
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java
index 190f3c98c73..978df01075e 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/DeleteLogicalViewProcedure.java
@@ -110,15 +110,13 @@ public class DeleteLogicalViewProcedure
deleteViewSchema(env);
return Flow.NO_MORE_STATE;
default:
- setFailure(new ProcedureException("Unrecognized state " +
state.toString()));
+ setFailure(new ProcedureException("Unrecognized state " + state));
return Flow.NO_MORE_STATE;
}
return Flow.HAS_MORE_STATE;
} finally {
LOGGER.info(
- String.format(
- "DeleteLogicalView-[%s] costs %sms",
- state.toString(), (System.currentTimeMillis() - startTime)));
+ "DeleteLogicalView-[{}] costs {}ms", state,
(System.currentTimeMillis() - startTime));
}
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java
index cfde4ed63a5..8b4f71aa356 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTemplateProcedure.java
@@ -136,15 +136,13 @@ public class SetTemplateProcedure
commitReleaseTemplate(env);
return Flow.NO_MORE_STATE;
default:
- setFailure(new ProcedureException("Unrecognized SetTemplateState " +
state.toString()));
+ setFailure(new ProcedureException("Unrecognized SetTemplateState " +
state));
return Flow.NO_MORE_STATE;
}
return Flow.HAS_MORE_STATE;
} finally {
LOGGER.info(
- String.format(
- "SetSchemaTemplate-[%s] costs %sms",
- state.toString(), (System.currentTimeMillis() - startTime)));
+ "SetSchemaTemplate-[{}] costs {}ms", state,
(System.currentTimeMillis() - startTime));
}
}
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
index 71074d28cf7..5ffd6c0bcc2 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/CreateTriggerProcedure.java
@@ -160,8 +160,8 @@ public class CreateTriggerProcedure extends
AbstractNodeProcedure<CreateTriggerS
}
} catch (Exception e) {
if (isRollbackSupported(state)) {
- LOG.error("Fail in CreateTriggerProcedure", e);
- setFailure(new ProcedureException(e.getMessage()));
+ LOG.warn("Create trigger {} failed.",
triggerInformation.getTriggerName(), e);
+ setFailure(new ProcedureException(e));
} else {
LOG.error(
"Retrievable error trying to create trigger [{}], state [{}]",
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
index 4bd8fb1c2d9..4bd6ed8b65e 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/trigger/DropTriggerProcedure.java
@@ -108,7 +108,7 @@ public class DropTriggerProcedure extends
AbstractNodeProcedure<DropTriggerState
}
} catch (Exception e) {
if (isRollbackSupported(state)) {
- LOG.error("Fail in DropTriggerProcedure", e);
+ LOG.warn("Drop trigger {} failed.", triggerName, e);
setFailure(new ProcedureException(e.getMessage()));
} else {
LOG.error(
