Repository: aurora Updated Branches: refs/heads/master c42b1af31 -> 38b9311c3
Remove ignored snapshot stats. Add high-level timings on storage start-up lifecycle. Reviewed at https://reviews.apache.org/r/54847/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/38b9311c Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/38b9311c Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/38b9311c Branch: refs/heads/master Commit: 38b9311c32c81c0143bb9923e21f58828b5ba3c3 Parents: c42b1af Author: David McLaughlin <[email protected]> Authored: Mon Dec 19 10:43:10 2016 -0800 Committer: David McLaughlin <[email protected]> Committed: Mon Dec 19 10:43:10 2016 -0800 ---------------------------------------------------------------------- .../aurora/scheduler/storage/log/LogStorage.java | 2 ++ .../scheduler/storage/log/SnapshotStoreImpl.java | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/38b9311c/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java index 9c9218c..387350c 100644 --- a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java +++ b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java @@ -396,6 +396,7 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore } @Override + @Timed("scheduler_storage_prepare") public synchronized void prepare() { writeBehindStorage.prepare(); // Open the log to make a log replica available to the scheduler group. @@ -407,6 +408,7 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore } @Override + @Timed("scheduler_storage_start") public synchronized void start(final MutateWork.NoResult.Quiet initializationLogic) { write((NoResult.Quiet) unused -> { // Must have the underlying storage started so we can query it for the last checkpoint. http://git-wip-us.apache.org/repos/asf/aurora/blob/38b9311c/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java index 239f2eb..7aa111e 100644 --- a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java +++ b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java @@ -130,7 +130,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_save_db") public void saveToSnapshot(MutableStoreProvider store, Snapshot snapshot) { LOG.info("Saving dbsnapshot"); // Note: we don't use mybatis mapped statements for performance reasons and to avoid @@ -152,7 +151,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_restore_db") public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (snapshot.isSetDbScript()) { try (Connection c = ((DataSource) store.getUnsafeStoreAccess()).getConnection()) { @@ -191,7 +189,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { // It's important for locks to be replayed first, since there are relations that expect // references to be valid on insertion. @Override - @Timed("snapshot_save_lock_store") public void saveToSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hydrateSnapshotFields.contains(getName())) { snapshot.setLocks(ILock.toBuildersSet(store.getLockStore().fetchLocks())); @@ -199,7 +196,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_restore_lock_store") public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hasDbSnapshot(snapshot)) { LOG.info("Deferring lock restore to dbsnapshot"); @@ -222,7 +218,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_save_host_attributes") public void saveToSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hydrateSnapshotFields.contains(getName())) { snapshot.setHostAttributes( @@ -231,7 +226,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_restore_host_attributes") public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hasDbSnapshot(snapshot)) { LOG.info("Deferring attribute restore to dbsnapshot"); @@ -254,7 +248,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_save_task_store") public void saveToSnapshot(MutableStoreProvider store, Snapshot snapshot) { snapshot.setTasks( IScheduledTask.toBuildersSet(store.getTaskStore().fetchTasks(Query.unscoped()))); @@ -262,7 +255,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_restore_task_store") public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hasDbTaskStore(snapshot)) { LOG.info("Deferring task restore to dbsnapshot"); @@ -284,7 +276,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_save_cron_store") public void saveToSnapshot(MutableStoreProvider store, Snapshot snapshot) { ImmutableSet.Builder<StoredCronJob> jobs = ImmutableSet.builder(); @@ -296,7 +287,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_restore_cron_store") public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hasDbTaskStore(snapshot)) { LOG.info("Deferring cron job restore to dbsnapshot"); @@ -347,7 +337,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_save_quota_store") public void saveToSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hydrateSnapshotFields.contains(getName())) { ImmutableSet.Builder<QuotaConfiguration> quotas = ImmutableSet.builder(); @@ -362,7 +351,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_restore_quota_store") public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hasDbSnapshot(snapshot)) { LOG.info("Deferring quota restore to dbsnapshot"); @@ -386,7 +374,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_save_update_store") public void saveToSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hydrateSnapshotFields.contains(getName())) { snapshot.setJobUpdateDetails(store.getJobUpdateStore().fetchAllJobUpdateDetails()); @@ -394,7 +381,6 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> { } @Override - @Timed("snapshot_restore_update_store") public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) { if (hasDbSnapshot(snapshot)) { LOG.info("Deferring job update restore to dbsnapshot");
