devmadhuu commented on code in PR #7517: URL: https://github.com/apache/ozone/pull/7517#discussion_r1875961655
########## hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/upgrade/ReconLastTaskStatusUpgradeAction.java: ########## @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.recon.upgrade; + +import org.apache.hadoop.ozone.recon.scm.ReconStorageContainerManagerFacade; +import org.jooq.DSLContext; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.SQLException; + +import static org.hadoop.ozone.recon.codegen.SqlDbUtils.COLUMN_EXISTS_CHECK; +import static org.hadoop.ozone.recon.codegen.SqlDbUtils.TABLE_EXISTS_CHECK; +import static org.hadoop.ozone.recon.schema.ReconTaskSchemaDefinition.RECON_TASK_STATUS_TABLE_NAME; + + +/** + * Handles the upgrade for {@link org.hadoop.ozone.recon.schema.ReconTaskSchemaDefinition} + * in case of missing <code>last_task_successful</code> and <code>current_task_run_status</code> columns. + */ +@UpgradeActionRecon(feature = ReconLayoutFeature.TASK_STATUS_COLUMN_ADDITION, + type = ReconUpgradeAction.UpgradeActionType.FINALIZE) +public class ReconLastTaskStatusUpgradeAction implements ReconUpgradeAction { + + public static final Logger LOG = LoggerFactory.getLogger(ReconLastTaskStatusUpgradeAction.class); + + @Override + public void execute(ReconStorageContainerManagerFacade scmFacade) throws SQLException { + DataSource dataSource = scmFacade.getDataSource(); + try (Connection conn = dataSource.getConnection()) { + if (!TABLE_EXISTS_CHECK.test(conn, RECON_TASK_STATUS_TABLE_NAME)) { + return; + } + DSLContext dslContext = DSL.using(conn); + + if (!COLUMN_EXISTS_CHECK.apply(conn, RECON_TASK_STATUS_TABLE_NAME, "last_task_run_status") + && !COLUMN_EXISTS_CHECK.apply(conn, RECON_TASK_STATUS_TABLE_NAME, "current_task_run_status")) { + // Add the new columns if it is not already present in the table + dslContext.alterTable(RECON_TASK_STATUS_TABLE_NAME) + .add( + DSL.field(DSL.name("last_task_successful"), SQLDataType.INTEGER), + DSL.field(DSL.name("current_task_run_status"), SQLDataType.INTEGER) + ) + .execute(); + } + } catch (SQLException se) { + throw new SQLException( Review Comment: Sorry, I didn't understand your comment. So now you have fixed my comment and only logging, so now you are not rethrowing same. My original comment was only about why are you catching same and rethrowing same. Also, now you are logging `se.getMessage()`, this may not contain full details of error. I would recommend to have just use `se` object. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
