Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade database and telemetry docker to stretch build #2541

Merged
merged 2 commits into from
Feb 9, 2019

Conversation

jipanyang
Copy link
Collaborator

Signed-off-by: Jipan Yang jipan.yang@alibaba-inc.com

- What I did
Move database and telemetry docker to stretch based.

- How I did it

- How to verify it

Docker moved to stretch build.

jipan@sonicvm1:~/warm_reboot/sonic-buildimage$ make list
+++ --- Making list --- +++
BLDENV=stretch make -f Makefile.work stretch
make[1]: Entering directory '/home/jipan/warm_reboot/sonic-buildimage'
SONiC Build System

Build Configuration
"CONFIGURED_PLATFORM"             : "broadcom"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_BUILD_JOBS"                : "8"
"SONIC_CONFIG_MAKE_JOBS"          : "8"
"USERNAME"                        : "admin"
"PASSWORD"                        : "admin"
"ENABLE_DHCP_GRAPH_SERVICE"       : ""
"SHUTDOWN_BGP_ON_START"           : ""
"ENABLE_PFCWD_ON_START"           : ""
"INSTALL_DEBUG_TOOLS"             : ""
"ROUTING_STACK"                   : "frr"
"FRR_USER_UID"                    : "300"
"FRR_USER_GID"                    : "300"
"ENABLE_SYNCD_RPC"                : ""
"ENABLE_ORGANIZATION_EXTENSIONS"  : "y"
"HTTP_PROXY"                      : ""
"HTTPS_PROXY"                     : ""
"ENABLE_SYSTEM_TELEMETRY"         : "y"
"SONIC_DEBUGGING_ON"              : "y"
"SONIC_PROFILING_ON"              : ""
"KERNEL_PROCURE_METHOD"           : "build"
"BUILD_TIMESTAMP"                 : "20190208.022025"
"BLDENV"                          : "stretch"

[ 01 ] [ target/docker-sonic-telemetry.gz ]
[ 02 ] [ target/docker-database.gz ]

And the stretch version of debian packages built

jipan@sonicvm1:~/warm_reboot/sonic-buildimage$ ls -l target/debs/stretch/redis-*
-rw-r--r-- 1 jipan jipan  18178 Feb  8 02:20 target/debs/stretch/redis-sentinel_3.2.4-1~bpo8+1_amd64.deb
-rw-r--r-- 1 jipan jipan 407152 Feb  8 02:20 target/debs/stretch/redis-server_3.2.4-1~bpo8+1_amd64.deb
-rw-r--r-- 1 jipan jipan 462362 Feb  8 02:20 target/debs/stretch/redis-tools_3.2.4-1~bpo8+1_amd64.deb
-rw-r--r-- 1 jipan jipan    329 Feb  8 02:20 target/debs/stretch/redis-tools_3.2.4-1~bpo8+1_amd64.deb-install.log
-rw-r--r-- 1 jipan jipan  49800 Feb  8 02:20 target/debs/stretch/redis-tools_3.2.4-1~bpo8+1_amd64.deb.log
jipan@sonicvm1:~/warm_reboot/sonic-buildimage$ ls -l target/debs/stretch/sonic-telemetry_0.1_amd64*
-rw-r--r-- 1 jipan jipan 10973960 Feb  8 01:28 target/debs/stretch/sonic-telemetry_0.1_amd64.deb
-rw-r--r-- 1 jipan jipan    12122 Feb  8 01:28 target/debs/stretch/sonic-telemetry_0.1_amd64.deb.log

system running as usual

root@sonic:/home/admin# docker ps
CONTAINER ID        IMAGE                             COMMAND                  CREATED             STATUS              PORTS               NAMES
fa593f0895e0        docker-snmp-sv2:latest            "/usr/bin/supervisord"   About an hour ago   Up About an hour                        snmp
3cffc58fcbd3        docker-syncd-brcm:latest          "/usr/bin/supervisord"   About an hour ago   Up About an hour                        syncd
743c65c606da        docker-orchagent-brcm:latest      "/usr/bin/supervisord"   About an hour ago   Up About an hour                        swss
bfeba7138bba        docker-sonic-telemetry:latest     "/usr/bin/supervisord"   About an hour ago   Up About an hour                        telemetry
2464ad8582d7        docker-router-advertiser:latest   "/usr/bin/supervisord"   About an hour ago   Up About an hour                        radv
388594cb00ee        docker-dhcp-relay:latest          "/usr/bin/docker_ini…"   About an hour ago   Up About an hour                        dhcp_relay
813b51408a19        docker-lldp-sv2:latest            "/usr/bin/supervisord"   About an hour ago   Up About an hour                        lldp
9e502708ce00        docker-platform-monitor:latest    "/usr/bin/supervisord"   About an hour ago   Up About an hour                        pmon
9037db19e631        docker-teamd:latest               "/usr/bin/supervisord"   About an hour ago   Up About an hour                        teamd
9310824cd940        docker-fpm-frr:latest             "/bin/sh -c '/usr/bi…"   About an hour ago   Up About an hour                        bgp
c3f3e03ff623        docker-database:latest            "/usr/bin/supervisord"   About an hour ago   Up About an hour                        database
root@sonic:/home/admin# docker exec -it database ps -ax
  PID TTY      STAT   TIME COMMAND
    1 pts/0    Ss+    0:01 /usr/bin/python /usr/bin/supervisord
   20 pts/0    Sl     0:00 /usr/sbin/rsyslogd -n
   21 pts/0    Sl     2:09 /usr/bin/redis-server 127.0.0.1:6379
  135 pts/1    Rs+    0:00 ps -ax
root@sonic:/home/admin# 
root@sonic:/home/admin# redis-cli info
# Server
redis_version:3.2.4
redis_git_sha1:5f622506
redis_git_dirty:1
redis_build_id:a3d993f9a75239dd
redis_mode:standalone
os:Linux 4.9.0-8-2-amd64 x86_64
arch_bits:64
multiplexing_api:epoll
gcc_version:6.3.0
process_id:21
run_id:f7141403072e8e504d13ebd76fa08abad58a57c2
tcp_port:6379
uptime_in_seconds:3655
uptime_in_days:0
hz:10
lru_clock:6117789
executable:/usr/bin/redis-server
config_file:/etc/redis/redis.conf

# Clients
connected_clients:408
client_longest_output_list:0
client_biggest_input_buf:0
blocked_clients:0

# Memory
used_memory:13613456
used_memory_human:12.98M
used_memory_rss:11575296
used_memory_rss_human:11.04M
used_memory_peak:14017720
used_memory_peak_human:13.37M
total_system_memory:8342999040
total_system_memory_human:7.77G
used_memory_lua:124928
used_memory_lua_human:122.00K
maxmemory:0
maxmemory_human:0B
maxmemory_policy:noeviction
mem_fragmentation_ratio:0.85
mem_allocator:jemalloc-3.6.0

# Persistence
loading:0
rdb_changes_since_last_save:2034869
rdb_bgsave_in_progress:0
rdb_last_save_time:1549618006
rdb_last_bgsave_status:ok
rdb_last_bgsave_time_sec:-1
rdb_current_bgsave_time_sec:-1
aof_enabled:0
aof_rewrite_in_progress:0
aof_rewrite_scheduled:0
aof_last_rewrite_time_sec:-1
aof_current_rewrite_time_sec:-1
aof_last_bgrewrite_status:ok
aof_last_write_status:ok

# Stats
total_connections_received:8902
total_commands_processed:1815142
instantaneous_ops_per_sec:2273
total_net_input_bytes:461002475
total_net_output_bytes:6967473001
instantaneous_input_kbps:223.38
instantaneous_output_kbps:4345.19
rejected_connections:0
sync_full:0
sync_partial_ok:0
sync_partial_err:0
expired_keys:0
evicted_keys:0
keyspace_hits:1027873
keyspace_misses:41842
pubsub_channels:79
pubsub_patterns:49
latest_fork_usec:0
migrate_cached_sockets:0

# Replication
role:master
connected_slaves:0
master_repl_offset:0
repl_backlog_active:0
repl_backlog_size:1048576
repl_backlog_first_byte_offset:0
repl_backlog_histlen:0

# CPU
used_cpu_sys:63.47
used_cpu_user:67.10
used_cpu_sys_children:0.00
used_cpu_user_children:0.00

# Cluster
cluster_enabled:0

# Keyspace
db0:keys=149,expires=0,avg_ttl=0
db1:keys=3134,expires=0,avg_ttl=0
db2:keys=2666,expires=0,avg_ttl=0
db3:keys=52,expires=0,avg_ttl=0
db4:keys=168,expires=0,avg_ttl=0
db5:keys=2651,expires=0,avg_ttl=0
db6:keys=125,expires=0,avg_ttl=0
root@sonic:/home/admin# 
root@sonic:/home/admin# 
root@sonic:/home/admin# 
root@sonic:/home/admin# 
root@sonic:/home/admin# docker exec -it telemetry ps -ax
  PID TTY      STAT   TIME COMMAND
    1 pts/0    Ss+    0:01 /usr/bin/python /usr/bin/supervisord
   12 pts/0    Sl     0:00 /usr/sbin/rsyslogd -n
   17 pts/0    Sl     0:25 /usr/sbin/telemetry -logtostderr --insecure --port 80
   24 pts/0    Sl     0:18 /usr/sbin/dialout_client_cli -insecure -logtostderr -
   66 pts/1    Rs+    0:00 ps -ax
root@sonic:/home/admin# 

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
rules/redis.mk Outdated Show resolved Hide resolved
@@ -3,3 +3,5 @@
SONIC_TELEMETRY = sonic-telemetry_0.1_amd64.deb
$(SONIC_TELEMETRY)_SRC_PATH = $(SRC_PATH)/telemetry
SONIC_DPKG_DEBS += $(SONIC_TELEMETRY)

SONIC_STRETCH_DEBS += $(SONIC_TELEMETRY)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think you need this, the docker target will build this in stretch.

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
@jipanyang
Copy link
Collaborator Author

One known issue with stretch build is that, even with "make list" or "BLDENV=stretch make list", it tries to build all missing deb and dockers for strecth. Guess we could fix that in future.

@lguohan lguohan merged commit 7b81d4d into sonic-net:master Feb 9, 2019
@jleveque
Copy link
Contributor

@jipanyang: Was there a reason not to upgrade REDIS_VERSION to the current Stretch default version, 3.2.6-3+deb9u2?

@lguohan
Copy link
Collaborator

lguohan commented May 29, 2019

I do not think so. 3.2.4 still have bugs we should upgrade.

@jipanyang
Copy link
Collaborator Author

@jleveque @lguohan I didn't pay attention to redis version. Yes, it should be upgraded to stretch default version. Are there critical bugs with 3.2.4?

@jipanyang
Copy link
Collaborator Author

Is going straight to 3.2.13 better?
https://raw.githubusercontent.com/antirez/redis/3.2/00-RELEASENOTES

@lguohan
Copy link
Collaborator

lguohan commented May 29, 2019

agree

@jleveque
Copy link
Contributor

@jipanyang: As long as the Debian packaging is available for version 3.2.13, we can do it.

Actually, it looks like the current version available from stretch-backports is 5.0.3-3~bpo9+2. We could potentially upgrade even further, to this version.

@jipanyang
Copy link
Collaborator Author

@jleveque redis is built with packages stored in sonicstorage.blob.core.windows.net https://github.com/Azure/sonic-buildimage/blob/master/src/redis/Makefile#L16, could you handle the package repo update and version upgrade together?

prsunny pushed a commit that referenced this pull request Dec 22, 2022
Updating sonic-swss to latest to include following fixes -

0d91125 [bufferorch] : Support for buffer profiles for VoQ on chassis (#2465)
94429f1 Fixed a bug causing error state of same configuration is applied twice. (#2580)
f1c0a75 Update FDB state table when , MAC entries are modified as dynamic_local. (#2575)
beaac71 [voq][chassis]Add show fabric counters port/queue commands (#2522)
44d1e9c Fix test_vlan.py (#2541)
c00455a Only collect stdout of orchagent_restart_check in vstest (#2578)
def98d9 Remove TODO comments which are no longer needed (#2568)
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Jan 5, 2023
…atform-common][py-swsssdk] advance submodule head

linkmgrd:
* bf75a93 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#157) (HEAD -> 202205, github/202205) [Liu Shilong]

utilities:
* c1fa31d 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#2530) (HEAD -> 202205) [Liu Shilong]
* 9990208 2022-05-19 | Add sonic-delayed.target to Application Extension .timer file generator (sonic-net#2176) [noaOrMlnx]

swss:
* 7b3170a 2023-01-05 | Revert "sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552)" (HEAD -> 202205) [Ying Xie]
* 4897e93 2023-01-05 | Revert "[bufferorch] : Support for buffer profiles for VoQ on chassis (sonic-net#2465)" (HEAD -> 202205, github/202205) [Ying Xie]
* bbccc68 2023-01-04 | [vstest] Only collect stdout of orchagent_restart_check in vstest (sonic-net#2597) (HEAD -> 202205, github/202205) [bingwang-ms]
* f7a7c05 2023-01-04 | Avoid aborting orchagent when setting TUNNEL attributes (sonic-net#2591) [Stephen Sun]
* 84064fa 2022-12-20 | Fixed a bug causing error state of same configuration is applied twice. (sonic-net#2580) [siqbal1986]
* 4851bef 2022-12-20 | Only collect stdout of orchagent_restart_check in vstest (sonic-net#2578) [bingwang-ms]
* 2904d95 2022-12-05 | sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552) [Sambath Kumar Balasubramanian]
* ac84e41 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#2546) [Liu Shilong]
* 502bd69 2022-12-20 | Fix `test_vlan.py` (sonic-net#2541) [Longxiang Lyu]
* 1e37d0e 2022-12-19 | [voq][chassis]Add show fabric counters port/queue commands (sonic-net#2522) [jfeng-arista]
* 17cdad3 2022-12-20 | [bufferorch] : Support for buffer profiles for VoQ on chassis (sonic-net#2465) [vmittal-msft]
* 5345338 2023-01-04 | Disable `arp_evict_nocarrier` for vlan host intf  (sonic-net#2590) [Longxiang Lyu]

swss-common:
* 9616287 2023-01-04 | Added customer monitoring  tables in app db and state db (sonic-net#725) (HEAD -> 202205) [siqbal1986]
* d03b95d 2022-11-30 |  Use github code scanning instead of LGTM (sonic-net#718) [Liu Shilong]
* 8a276c6 2022-12-28 | Fix sonic-slave docker image environment issue. (sonic-net#728) (github/202205) [Liu Shilong]
* 8fee1b4 2022-11-14 | Fix memory leak issue in ConfigDBConnector. (sonic-net#655) (sonic-net#706) [Hua Liu]

sairedis:
* 5387602 2022-11-30 | Use github code scanning instead of LGTM (#1160) (HEAD -> 202205) [Liu Shilong]

platform-daemons:
* b499412 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#316) (HEAD -> 202205, github/202205) [Liu Shilong]

platform-common:
* d11e983 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#328) (HEAD -> 202205) [Liu Shilong]

py-swsssdk:
* b654e91 2022-11-30 | Use github code scanning instead of LGTM (sonic-net#131) (HEAD -> 202205) [Liu Shilong]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
yxieca added a commit that referenced this pull request Jan 5, 2023
…atform-common][py-swsssdk] advance submodule head (#13260)

linkmgrd:
* bf75a93 2022-11-30 | Use github code scanning instead of LGTM (#157) (HEAD -> 202205, github/202205) [Liu Shilong]

utilities:
* c1fa31d 2022-11-30 | Use github code scanning instead of LGTM (#2530) (HEAD -> 202205) [Liu Shilong]
* 9990208 2022-05-19 | Add sonic-delayed.target to Application Extension .timer file generator (#2176) [noaOrMlnx]

swss:
* bbccc68 2023-01-04 | [vstest] Only collect stdout of orchagent_restart_check in vstest (#2597) (HEAD -> 202205, github/202205) [bingwang-ms]
* f7a7c05 2023-01-04 | Avoid aborting orchagent when setting TUNNEL attributes (#2591) [Stephen Sun]
* 84064fa 2022-12-20 | Fixed a bug causing error state of same configuration is applied twice. (#2580) [siqbal1986]
* 4851bef 2022-12-20 | Only collect stdout of orchagent_restart_check in vstest (#2578) [bingwang-ms]
* 2904d95 2022-12-05 | sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (#2552) [Sambath Kumar Balasubramanian]
* ac84e41 2022-11-30 | Use github code scanning instead of LGTM (#2546) [Liu Shilong]
* 502bd69 2022-12-20 | Fix `test_vlan.py` (#2541) [Longxiang Lyu]
* 1e37d0e 2022-12-19 | [voq][chassis]Add show fabric counters port/queue commands (#2522) [jfeng-arista]
* 17cdad3 2022-12-20 | [bufferorch] : Support for buffer profiles for VoQ on chassis (#2465) [vmittal-msft]
* 5345338 2023-01-04 | Disable `arp_evict_nocarrier` for vlan host intf  (#2590) [Longxiang Lyu]

swss-common:
* 9616287 2023-01-04 | Added customer monitoring  tables in app db and state db (#725) (HEAD -> 202205) [siqbal1986]
* d03b95d 2022-11-30 |  Use github code scanning instead of LGTM (#718) [Liu Shilong]
* 8a276c6 2022-12-28 | Fix sonic-slave docker image environment issue. (#728) (github/202205) [Liu Shilong]
* 8fee1b4 2022-11-14 | Fix memory leak issue in ConfigDBConnector. (#655) (#706) [Hua Liu]

sairedis:
* 5387602 2022-11-30 | Use github code scanning instead of LGTM (#1160) (HEAD -> 202205) [Liu Shilong]

platform-daemons:
* b499412 2022-11-30 | Use github code scanning instead of LGTM (#316) (HEAD -> 202205, github/202205) [Liu Shilong]

platform-common:
* d11e983 2022-11-30 | Use github code scanning instead of LGTM (#328) (HEAD -> 202205) [Liu Shilong]

py-swsssdk:
* b654e91 2022-11-30 | Use github code scanning instead of LGTM (#131) (HEAD -> 202205) [Liu Shilong]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
mihirpat1 pushed a commit to mihirpat1/sonic-buildimage that referenced this pull request Jun 14, 2023
[VS] Fix Vlan test for the signature of wait_for_n_keys
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants