- Add a log entry for repo verb handling and make the container usage calculation take it into account

- Move all the repo push/pull/verb logging into a central track_and_log method
- Readd images accidentally deleted in the last CL
- Make the uncompressed size migration script better handle exceptions

data/migrations/migration.sh

@@ -5,8 +5,8 @@ up_mysql() {
   docker run --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password -d mysql
 
   # Sleep for 5s to get MySQL get started.
-  echo 'Sleeping for 5...'
-  sleep 5
+  echo 'Sleeping for 10...'
+  sleep 10
 
   # Add the database to mysql.
   docker run --rm --link mysql:mysql mysql sh -c 'echo "create database genschema" | mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -ppassword'

data/migrations/versions/204abf14783d_add_log_entry_kind_for_verbs.py

@@ -0,0 +1,28 @@
+"""Add log entry kind for verbs
+
+Revision ID: 204abf14783d
+Revises: 2430f55c41d5
+Create Date: 2014-10-29 15:38:06.100915
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '204abf14783d'
+down_revision = '2430f55c41d5'
+
+from alembic import op
+import sqlalchemy as sa
+
+def upgrade(tables):
+    op.bulk_insert(tables.logentrykind,
+    [
+        {'id': 46, 'name':'repo_verb'},
+    ])
+
+
+def downgrade(tables):
+    op.execute(
+        (tables.logentrykind.delete()
+            .where(tables.logentrykind.c.name == op.inline_literal('repo_verb')))
+
+    )

data/migrations/versions/43e943c0639f_add_log_kind_for_regenerating_robot_.py

@@ -12,7 +12,6 @@ down_revision = '82297d834ad'
 
 from alembic import op
 import sqlalchemy as sa
-from sqlalchemy.dialects import mysql
 
 def upgrade(tables):
     op.bulk_insert(tables.logentrykind,

data/model/legacy.py

@@ -2226,7 +2226,10 @@ def confirm_team_invite(code, user):
 
 def get_repository_usage():
   repo_pull = LogEntryKind.get(name = 'pull_repo')
-  return (LogEntry.select().where(LogEntry.kind == repo_pull, ~(LogEntry.repository >> None))
+  repo_verb = LogEntryKind.get(name = 'repo_verb')
+  return (LogEntry.select()
+                  .where((LogEntry.kind == repo_pull) | (LogEntry.kind == repo_verb))
+                  .where(~(LogEntry.repository >> None))
                   .group_by(LogEntry.ip)
                   .group_by(LogEntry.repository)
                   .count())