DWH Issue on Retention Policy

Hello,

Recently my DWH Analytics have stopped updating. I've found a couple of things from the FAQ that look like they would apply, but running through the fixes has not solved my problem. What I've found so far:
Errors in etl_perform_retention_policy:

> Move old partitions to archive - An error occurred executing this job entry :
> Couldn't execute SQL: CALL move_innodb_to_archive()
>Too many partitions (including subpartitions) were defined

Everything else looks clean in the log files. Checking the locks in the database I find that retention_lock is set at 1, so I updated the table to set it back to 0, and called kalturadw.add_partitions();

After that was finished, I ran the manual update script for the DWH, and end up with the same error in the DWH logs and retention_lock gets stuck at 1 again. Any ideas?